diff --git a/infer/tests/build_systems/clang_compilation_db_escaped/Makefile b/infer/tests/build_systems/clang_compilation_db_escaped/Makefile
index e9a7ba584..f7afaf97f 100644
--- a/infer/tests/build_systems/clang_compilation_db_escaped/Makefile
+++ b/infer/tests/build_systems/clang_compilation_db_escaped/Makefile
@@ -26,7 +26,7 @@ compile_commands.json: compile_commands.json.in
 	$(QUIET)sed -e 's#%pwd%#$(CURDIR)#g' $< > $@ || $(REMOVE) $@
 
 infer-out/report.json: compile_commands.json $(SOURCES) Makefile \
-                       ../codetoanalyze/path\ with\ spaces/hel\ lo.c
+                       ../codetoanalyze/path\ with\ spaces/hel\ lo.c $(CLANG_DEPS)
 	$(QUIET)$(call silent_on_success,Clang compilation database escaped integration,\
 	  $(INFER_BIN) -a $(ANALYZER) $(INFER_OPTIONS) --project-root $(TESTS_DIR) \
 	  --compilation-database-escaped $<)
diff --git a/infer/tests/codetoanalyze/cpp/siof/Makefile b/infer/tests/codetoanalyze/cpp/siof/Makefile
index 06835c462..2eb4139f8 100644
--- a/infer/tests/codetoanalyze/cpp/siof/Makefile
+++ b/infer/tests/codetoanalyze/cpp/siof/Makefile
@@ -32,4 +32,4 @@ HEADERS = siof/siof_types.h siof/smart_pointer1.h
 
 include $(TESTS_DIR)/clang.make
 
-infer-out/report.json: $(MAKEFILE_LIST)
+infer-out$(TEST_SUFFIX)/report.json: $(MAKEFILE_LIST)