diff --git a/Makefile b/Makefile
index 1bcfe2088..78c9e153d 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ cpp_infer_test:
 	$(MAKE) -C ./infer/tests/codetoanalyze/cpp/errors test
 
 cpp_quandary_test:
-	make -C ./infer/tests/codetoanalyze/cpp/quandary test
+	$(MAKE) -C ./infer/tests/codetoanalyze/cpp/quandary test
 
 java_checkers_test:
 	$(MAKE) -C ./infer/tests/codetoanalyze/java/checkers test
diff --git a/infer/tests/build_systems/build_integration_tests.py b/infer/tests/build_systems/build_integration_tests.py
index c508e3fab..0aab13338 100755
--- a/infer/tests/build_systems/build_integration_tests.py
+++ b/infer/tests/build_systems/build_integration_tests.py
@@ -41,6 +41,8 @@ from inferlib import config, issues, utils
 
 ROOT_DIR = os.path.join(SCRIPT_DIR, os.pardir, os.pardir, os.pardir)
 
+INFER_BIN = os.path.join(ROOT_DIR, 'infer', 'bin', 'infer')
+
 CLANG_BIN = os.path.join(ROOT_DIR, 'facebook-clang-plugins', 'clang',
                          'install', 'bin', 'clang')
 
@@ -126,7 +128,7 @@ def run_analysis(clean_cmds, build_cmds, extra_check, should_fail, env=None):
         extra_args = (build_cmd['infer_args']
                       if 'infer_args' in build_cmd
                       else [])
-        infer_cmd = (['infer', '-o', temp_out_dir] +
+        infer_cmd = ([INFER_BIN, '-o', temp_out_dir] +
                      extra_args +
                      ['--'] +
                      build_cmd['compile'])
diff --git a/infer/tests/codetoanalyze/c/frontend/Makefile b/infer/tests/codetoanalyze/c/frontend/Makefile
index b466c3c76..19ecf3270 100644
--- a/infer/tests/codetoanalyze/c/frontend/Makefile
+++ b/infer/tests/codetoanalyze/c/frontend/Makefile
@@ -17,4 +17,4 @@ compile:
 	clang $(OPTIONS) $(FILES)
 
 capture:
-	infer -a capture --frontend-tests --cxx -- clang $(OPTIONS) $(FILES)
+	$(INFER_BIN) -a capture --frontend-tests --cxx -- clang $(OPTIONS) $(FILES)
diff --git a/infer/tests/codetoanalyze/cpp/frontend/Makefile b/infer/tests/codetoanalyze/cpp/frontend/Makefile
index e01891ba4..2bf1afe66 100644
--- a/infer/tests/codetoanalyze/cpp/frontend/Makefile
+++ b/infer/tests/codetoanalyze/cpp/frontend/Makefile
@@ -16,4 +16,4 @@ compile:
 	clang $(OPTIONS) $(FILES)
 
 capture:
-	infer -a capture --frontend-tests --cxx --headers -- clang $(OPTIONS) $(FILES)
+	$(INFER_BIN) -a capture --frontend-tests --cxx --headers -- clang $(OPTIONS) $(FILES)
diff --git a/infer/tests/codetoanalyze/objc/frontend/Makefile b/infer/tests/codetoanalyze/objc/frontend/Makefile
index 939370e98..f3830fbda 100644
--- a/infer/tests/codetoanalyze/objc/frontend/Makefile
+++ b/infer/tests/codetoanalyze/objc/frontend/Makefile
@@ -86,8 +86,8 @@ compile:
 	clang $(OPTIONS) -fobjc-arc $(FILES_ARC)
 
 capture:
-	infer -a capture --cxx --frontend-tests --continue --reactive -- clang $(OPTIONS) $(FILES_NOARC)
-	infer -a capture --cxx --frontend-tests -- clang $(OPTIONS) -fobjc-arc $(FILES_ARC)
+	$(INFER_BIN) -a capture --cxx --frontend-tests --continue --reactive -- clang $(OPTIONS) $(FILES_NOARC)
+	$(INFER_BIN) -a capture --cxx --frontend-tests -- clang $(OPTIONS) -fobjc-arc $(FILES_ARC)
 
 
 
diff --git a/infer/tests/codetoanalyze/objcpp/frontend/Makefile b/infer/tests/codetoanalyze/objcpp/frontend/Makefile
index 4fca3817a..2c795f7b3 100644
--- a/infer/tests/codetoanalyze/objcpp/frontend/Makefile
+++ b/infer/tests/codetoanalyze/objcpp/frontend/Makefile
@@ -23,7 +23,7 @@ compile:
 	clang $(OPTIONS) $(FILES)
 
 capture:
-	infer -a capture --cxx --frontend-tests --continue --reactive -- clang $(OPTIONS) $(FILES)
+	$(INFER_BIN) -a capture --cxx --frontend-tests --continue --reactive -- clang $(OPTIONS) $(FILES)