diff --git a/infer/tests/build_systems/buck/Makefile b/infer/tests/build_systems/buck/Makefile
index d68c37923..a5f0cbcc0 100644
--- a/infer/tests/build_systems/buck/Makefile
+++ b/infer/tests/build_systems/buck/Makefile
@@ -10,10 +10,8 @@ ROOT_DIR = $(TESTS_DIR)/../..
 
 ANALYZER = infer
 BUCK_TARGET = //infer/tests/codetoanalyze/java/infer:compile
-SOURCES = $(addprefix $(ROOT_DIR), $(shell buck audit input $(BUCK_TARGET)))
-TARGET_OUTPUT = $(word 2, $(shell buck targets --show-output $(BUCK_TARGET)))
-OBJECTS = $(ROOT_DIR)/$(TARGET_OUTPUT)
-
+SOURCES = $(wildcard $(TESTS_DIR)/codetoanalyze/java/infer/*.java)
+OBJECTS = $(ROOT_DIR)/buck-out/gen/infer/tests/codetoanalyze/java/infer/lib__compile_compile__output/compile_compile.jar
 INFERPRINT_OPTIONS = --project-root $(ROOT_DIR) --issues-tests
 CLEAN_EXTRA = $(ROOT_DIR)/buck-out
 
@@ -28,6 +26,7 @@ $(OBJECTS): $(JAVA_SOURCE_FILES)
 
 infer-out/report.json: $(JAVA_DEPS) $(JAVA_SOURCE_FILES)
 	cd $(ROOT_DIR) && \
+	$(REMOVE_DIR) buck-out && \
 	$(call silent_on_success,\
 	INFER_BIN=$(INFER_BIN) NO_BUCKD=1 \
 	$(INFER_BIN) -a $(ANALYZER) --results-dir $(CURDIR)/infer-out -- \
diff --git a/infer/tests/build_systems/genrule/Makefile b/infer/tests/build_systems/genrule/Makefile
index d13900fa3..68e4fd978 100644
--- a/infer/tests/build_systems/genrule/Makefile
+++ b/infer/tests/build_systems/genrule/Makefile
@@ -9,16 +9,11 @@ TESTS_DIR = ../..
 ROOT_DIR = $(TESTS_DIR)/../..
 
 ANALYZER = infer
-
 BUCK_TARGET = //infer/tests/build_systems/genrule/module2:module2
-SOURCES = $(addprefix $(ROOT_DIR), $(shell buck audit input $(BUCK_TARGET)))
-TARGET_OUTPUT = $(word 2, $(shell buck targets --show-output $(BUCK_TARGET)))
-OBJECTS = $(ROOT_DIR)/$(TARGET_OUTPUT)
-
 INFER_TARGET = $(BUCK_TARGET)_infer
-GENRULE_OUTPUT = $(word 2, $(shell GENERATE_INFER_GENRULES=1 buck targets --show-output $(INFER_TARGET)))
-JSON_REPORT = $(ROOT_DIR)/$(GENRULE_OUTPUT)/report.json
-
+SOURCES = $(wildcard $(TESTS_DIR)/codetoanalyze/java/infer/*.java)
+OBJECTS = $(ROOT_DIR)/buck-out/genruletest/gen/infer/tests/build_systems/genrule/module2/lib__module2_compile__output/module2_compile.jar
+JSON_REPORT = $(ROOT_DIR)/buck-out/gen/infer/tests/build_systems/genrule/module2/module2_infer/infer_out/report.json
 INFER_OPTIONS = --project-root $(ROOT_DIR)
 INFERPRINT_OPTIONS = --project-root $(ROOT_DIR) --issues-tests
 CLEAN_EXTRA = $(ROOT_DIR)/buck-out/genruletest
@@ -37,7 +32,7 @@ genrule: $(JSON_REPORT)
 
 $(JSON_REPORT): $(JAVA_DEPS) $(JAVA_SOURCE_FILES)
 	cd $(ROOT_DIR) && \
-    $(REMOVE_DIR) buck-out && \
+	$(REMOVE_DIR) buck-out && \
 	$(call silent_on_success,\
 	INFER_BIN="$(INFER_BIN)" NO_BUCKD=1 GENERATE_INFER_GENRULES=1 \
 	buck build --no-cache $(INFER_TARGET))