diff --git a/infer/tests/build_systems/delete_results_dir/Makefile b/infer/tests/build_systems/delete_results_dir/Makefile
index a050a6991..1ca2aceb2 100644
--- a/infer/tests/build_systems/delete_results_dir/Makefile
+++ b/infer/tests/build_systems/delete_results_dir/Makefile
@@ -24,8 +24,8 @@ include $(TESTS_DIR)/clang.make
 
 infer-out/report.json: $(CLANG_DEPS) $(SOURCES)
 	$(QUIET)$(call silent_on_success,Testing that infer deletes the results directory: part 1/2,\
-	  $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello.c)
+	  $(INFER_BIN) --no-keep-going --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello.c)
 	$(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt)
 	$(QUIET)$(call silent_on_success,Testing that infer deletes the results directory: part 2/2,\
-	  $(INFER_BIN) --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello2.c)
+	  $(INFER_BIN) --no-keep-going --dump-duplicate-symbols $(INFER_OPTIONS) -a $(ANALYZER) -- clang $(CLANG_OPTIONS) $(CODETOANALYZE_DIR)/hello2.c)
 	$(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt)
diff --git a/infer/tests/build_systems/diff/Makefile b/infer/tests/build_systems/diff/Makefile
index ec51acc0a..ee7537b84 100644
--- a/infer/tests/build_systems/diff/Makefile
+++ b/infer/tests/build_systems/diff/Makefile
@@ -28,7 +28,7 @@ $(INFER_OUT)/differential/introduced.json: $(SOURCES) $(CLANG_DEPS)
 	$(QUIET)$(MKDIR_P) src
 	$(QUIET)$(COPY) $(SRC_DIR)/some_bugs.c src/hello.c
 	$(QUIET)$(call silent_on_success,Running diff analysis in $(TEST_REL_DIR),\
-	  $(INFER_BIN) -o $(INFER_OUT) --project-root $(CURDIR) diff \
+	  $(INFER_BIN) --no-keep-going -o $(INFER_OUT) --project-root $(CURDIR) diff \
 	        $(INFER_OPTIONS))
 
 introduced.exp.test: $(INFER_OUT)/differential/introduced.json $(INFER_BIN)
diff --git a/infer/tests/build_systems/fail_on_issue/Makefile b/infer/tests/build_systems/fail_on_issue/Makefile
index d4cd63fcd..a308ba56e 100644
--- a/infer/tests/build_systems/fail_on_issue/Makefile
+++ b/infer/tests/build_systems/fail_on_issue/Makefile
@@ -24,7 +24,7 @@ default: compile
 
 issues.exp.test: $(CLANG_DEPS) $(SOURCES)
 	$(QUIET)$(call silent_on_success,Testing Infer fails on issue,\
-	  ($(INFER_BIN) --fail-on-issue -- clang $(CLANG_OPTIONS) $(SOURCES); \
+	  ($(INFER_BIN) --no-keep-going --fail-on-issue -- clang $(CLANG_OPTIONS) $(SOURCES); \
 	   echo "infer exit code: $$?" > $@))
 
 .PHONY: compile
diff --git a/infer/tests/build_systems/make/Makefile b/infer/tests/build_systems/make/Makefile
index 4c0cdfa52..bc448793f 100644
--- a/infer/tests/build_systems/make/Makefile
+++ b/infer/tests/build_systems/make/Makefile
@@ -18,6 +18,6 @@ include $(TESTS_DIR)/clang.make
 
 infer-out/report.json: $(CLANG_DEPS) $(SOURCES) $(HEADERS)
 	$(QUIET)$(call silent_on_success,Testing make clang and javac integration,\
-	  $(INFER_BIN) --dump-duplicate-symbols --project-root $(TESTS_DIR) -a $(ANALYZER) -- \
+	  $(INFER_BIN) --no-keep-going --dump-duplicate-symbols --project-root $(TESTS_DIR) -a $(ANALYZER) -- \
 	    make -C ../codetoanalyze/make clean all)
 	$(QUIET)$(call check_no_duplicates,infer-out/duplicates.txt)