diff --git a/Makefile b/Makefile
index 32ef113c4..400e7b2d7 100644
--- a/Makefile
+++ b/Makefile
@@ -26,15 +26,15 @@ endif
 
 DIRECT_TESTS=
 ifeq ($(BUILD_C_ANALYZERS),yes)
-DIRECT_TESTS += c_errors_test c_frontend_test cpp_checkers_test cpp_errors_test cpp_frontend_test cpp_quandary_test
+DIRECT_TESTS += c_errors c_frontend cpp_checkers cpp_errors cpp_frontend cpp_quandary
 endif
 ifeq ($(BUILD_JAVA_ANALYZERS),yes)
 DIRECT_TESTS += \
-  java_checkers_test java_eradicate_test java_infer_test java_tracing_test \
-  java_quandary_test java_threadsafety_test java_crashcontext_test java_harness_test
+  java_checkers java_eradicate java_infer java_tracing java_quandary java_threadsafety \
+  java_crashcontext java_harness
 endif
 ifneq ($(XCODE_SELECT),no)
-DIRECT_TESTS += objc_frontend_test objc_errors_test objc_linters_test objcpp_frontend_test objcpp_linters_test
+DIRECT_TESTS += objc_frontend objc_errors objc_linters objcpp_frontend objcpp_linters
 endif
 
 .PHONY: all
@@ -95,58 +95,49 @@ endif
 ocaml_unit_test: test_build
 	$(call silent_on_success,$(TEST_BUILD_DIR)/unit/inferunit.byte)
 
-DIRECT_TESTS_REPLACE = $(patsubst %_frontend_test,%_frontend_replace,$(filter %_frontend_test,$(DIRECT_TESTS)))
+DIRECT_TESTS_REPLACE = $(patsubst %_frontend,%_frontend_replace,$(filter %_frontend,$(DIRECT_TESTS)))
+
+define silence_make
+  ($(1) 2> >(grep -v "warning: \(ignoring old\|overriding\) \(commands\|recipe\) for target") \
+  ; exit $${PIPESTATUS[0]})
+endef
 
 .PHONY: frontend_replace
 frontend_replace: $(DIRECT_TESTS_REPLACE)
 
-define gen_direct_test_rule
-.PHONY: $(1)
-$(1): infer
-	($(MAKE) -C \
-	  $(INFER_DIR)/tests/codetoanalyze/$(shell printf $(1) | cut -f 1 -d _)/$(shell printf $(1) | cut -f 2 -d _) \
-	  test \
-	3>&1 1>&2- 2>&3- ) \
-	| grep -v "warning: ignoring old commands for target" \
-	| grep -v "warning: overriding commands for target" \
-	; exit $$$${PIPESTATUS[0]}
-
-.PHONY: $(1)_clean
-$(1)_clean:
-	@$(MAKE) -C \
-	  $(INFER_DIR)/tests/codetoanalyze/$(shell printf $(1) | cut -f 1 -d _)/$(shell printf $(1) | cut -f 2 -d _) \
-	  clean
-endef
+.PHONY: $(DIRECT_TESTS:%=direct_%_test)
+$(DIRECT_TESTS:%=direct_%_test): infer
+	@$(call silence_make,\
+	$(MAKE) -C \
+	  $(INFER_DIR)/tests/codetoanalyze/$(shell printf $@ | cut -f 2 -d _)/$(shell printf $@ | cut -f 3 -d _) \
+	  test)
 
-$(foreach test,$(DIRECT_TESTS) $(DIRECT_TESTS_REPLACE),\
-    $(eval \
-        $(call gen_direct_test_rule,$(test))))
+.PHONY: $(DIRECT_TESTS:%=direct_%_clean)
+$(DIRECT_TESTS:%=direct_%_clean):
+	@$(call silence_make,\
+	$(MAKE) -C \
+	  $(INFER_DIR)/tests/codetoanalyze/$(shell printf $@ | cut -f 2 -d _)/$(shell printf $@ | cut -f 3 -d _) \
+	  clean)
 
 .PHONY: direct_tests
-direct_tests: $(DIRECT_TESTS)
-
-define gen_build_system_test_rule
-.PHONY: build_$(1)_test
-build_$(1)_test: infer
-	@($(MAKE) -C $(INFER_DIR)/tests/build_systems/$(1) test \
-	3>&1 1>&2- 2>&3- ) \
-	| grep -v "warning: ignoring old commands for target" \
-	| grep -v "warning: overriding commands for target" \
-	; exit $$$${PIPESTATUS[0]}
-
-.PHONY: build_$(1)_clean
-build_$(1)_clean:
-	@$(MAKE) -C $(INFER_DIR)/tests/build_systems/$(1) clean
-endef
+direct_tests: $(DIRECT_TESTS:%=direct_%_test)
+
+.PHONY: $(BUILD_SYSTEMS_TESTS:%=build_%_test)
+$(BUILD_SYSTEMS_TESTS:%=build_%_test): infer
+	@$(call silence_make,\
+	$(MAKE) -C $(INFER_DIR)/tests/build_systems/$(patsubst build_%_test,%,$@) test)
 
-$(foreach test,$(BUILD_SYSTEMS_TESTS), $(eval $(call gen_build_system_test_rule,$(test))))
+.PHONY: $(BUILD_SYSTEMS_TESTS:%=build_%_clean)
+$(BUILD_SYSTEMS_TESTS:%=build_%_clean):
+	@$(call silence_make,\
+	$(MAKE) -C $(INFER_DIR)/tests/build_systems/$(patsubst build_%_clean,%,$@) clean)
 
 .PHONY: build_systems_tests
-build_systems_tests: infer $(foreach test,$(BUILD_SYSTEMS_TESTS),build_$(test)_test)
+build_systems_tests: infer $(BUILD_SYSTEMS_TESTS:%=build_%_test)
 	NO_BUCKD=1 $(INFER_DIR)/tests/build_systems/build_integration_tests.py
 
-.PHONY: buck_test
-buck_test: direct_tests build_systems_tests
+.PHONY: endtoend_test
+endtoend_test: direct_tests build_systems_tests
 
 .PHONY: inferTraceBugs_test
 inferTraceBugs_test: infer
@@ -182,16 +173,12 @@ inferScriptMode_test: test_build
 checkCopyright:
 	@$(MAKE) -C $(SRC_DIR) checkCopyright
 
-.PHONY: run-test
-run-test: test_build ocaml_unit_test buck_test inferTraceBugs_test inferScriptMode_test checkCopyright
-	$(MAKE) -C $(SRC_DIR) mod_dep.dot
-
 .PHONY: test
-test:
+test: test_build ocaml_unit_test endtoend_test inferTraceBugs_test inferScriptMode_test \
+      checkCopyright
+	@$(MAKE) -C $(SRC_DIR) mod_dep.dot
 ifeq (,$(findstring s,$(MAKEFLAGS)))
-	@$(MAKE) run-test && echo "ALL TESTS PASSED"
-else
-	@$(MAKE) run-test
+	@echo "ALL TESTS PASSED"
 endif
 
 .PHONY: quick-test
@@ -199,7 +186,7 @@ quick-test: test_build ocaml_unit_test
 
 .PHONY: test-replace
 test-replace:
-	@$(MAKE) -k run-test || true
+	@$(MAKE) -k endtoend_test || true
 	@for file in $$(find $(INFER_DIR)/tests -name "*.exp.test"); do \
 	    mv -f $$file $$(dirname $$file)/$$(basename -s .exp.test $$file).exp; done
 	@for file in $$(find $(INFER_DIR)/tests -name "*.test.dot"); do \
@@ -213,8 +200,7 @@ uninstall:
 	$(REMOVE) $(DESTDIR)$(bindir)/infer
 
 .PHONY: test_clean
-test_clean: $(foreach test,$(DIRECT_TESTS),$(test)_clean) \
-            $(foreach test,$(BUILD_SYSTEMS_TESTS),build_$(test)_clean)
+test_clean: $(DIRECT_TESTS:%=direct_%_clean) $(BUILD_SYSTEMS_TESTS:%=build_%_clean)
 
 .PHONY: install
 install: infer
diff --git a/infer/models/Makefile b/infer/models/Makefile
index 2a85d6454..63794fa76 100644
--- a/infer/models/Makefile
+++ b/infer/models/Makefile
@@ -34,8 +34,7 @@ clean_specs:
 $(CLANG_SUBDIRS):
 	@$(MAKE) -C $@ install
 
-clang:
-	@$(MAKE) $(CLANG_SUBDIRS)
+clang: $(CLANG_SUBDIRS)
 
 java:
 	@$(MAKE) -C $@ install
diff --git a/infer/models/c/Makefile b/infer/models/c/Makefile
index e9572d21f..791c1aced 100644
--- a/infer/models/c/Makefile
+++ b/infer/models/c/Makefile
@@ -17,7 +17,7 @@ all: install
 $(INFER_RESULTS): $(C_MODELS_SOURCES) $(CLANG_DEPS)
 # make clean in src/ in case $(CLANG_DEPS) have changed
 	@$(MAKE) -C src clean
-	$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
+	@$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
 
 $(C_MODELS_FILE): $(INFER_RESULTS)
 	@$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/models/cpp/Makefile b/infer/models/cpp/Makefile
index 93a15f1b5..a0a18a30f 100644
--- a/infer/models/cpp/Makefile
+++ b/infer/models/cpp/Makefile
@@ -18,7 +18,7 @@ all: install
 $(INFER_RESULTS): $(CPP_MODELS_SOURCES) $(C_MODELS_SOURCES) $(CLANG_DEPS)
 # make clean in src/ in case $(CLANG_DEPS) have changed
 	@$(MAKE) -C src clean
-	$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
+	@$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
 
 $(CPP_MODELS_FILE): $(INFER_RESULTS)
 	@$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/models/objc/Makefile b/infer/models/objc/Makefile
index 85f40c04c..4f2db986c 100644
--- a/infer/models/objc/Makefile
+++ b/infer/models/objc/Makefile
@@ -17,8 +17,7 @@ all: install
 $(INFER_RESULTS): $(OBJC_MODELS_SOURCES) $(CLANG_DEPS)
 # make clean in src/ in case $(CLANG_DEPS) have changed
 	@$(MAKE) -C src clean
-	$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
-	touch $(OBJC_MODELS_FILE)
+	@$(INFER_BIN) -o $(@D) --models-mode --no-failures-allowed -- $(MAKE) -C src
 
 $(OBJC_MODELS_FILE): $(INFER_RESULTS)
 	@$(INSTALL_DATA) $(dir $(INFER_RESULTS))/specs/*.specs $(SPECS_LIB_DIR)
diff --git a/infer/src/backend/infer.ml b/infer/src/backend/infer.ml
index 597609bd0..c5776619a 100644
--- a/infer/src/backend/infer.ml
+++ b/infer/src/backend/infer.ml
@@ -305,6 +305,11 @@ let () =
   (* re-set log files, as default files were in results_dir removed above *)
   L.set_log_file_identifier Config.current_exe (Some (CLOpt.exe_name Config.current_exe)) ;
   if Config.is_originator then L.do_out "%s@\n" Config.version_string ;
+  (* infer might be called from a Makefile and itself uses `make` to run the analysis in parallel,
+     but cannot communicate with the parent make command. Since infer won't interfere with them
+     anyway, pretend that we are not called from another make to prevent make falling back to a
+     mono-threaded execution. *)
+  Unix.unsetenv "MAKEFLAGS";
   register_perf_stats_report () ;
   touch_start_file () ;
   capture build_cmd build_mode ;