diff --git a/FILES.md b/FILES.md
index 47ad6cac1..771b36992 100644
--- a/FILES.md
+++ b/FILES.md
@@ -4,9 +4,6 @@
 
 *infer* : Main command to run Infer. Check out the docs for instructions on how to use it.
 
-*inferTest* : Shell script for running Infer's tests. Uses Buck for running the tests.
-Usage: inferTest {c, objc, java} for the tests about the analysis of C, Objective-C, or Java files.
-
 *inferTraceBugs* : Python script to explore the error traces in Infer reports
 
 ## Helper commands
diff --git a/Makefile b/Makefile
index fa5399d6a..46beebef1 100644
--- a/Makefile
+++ b/Makefile
@@ -49,8 +49,10 @@ $(INFERCLANG_WRAPPERS_PATHS): Makefile
 	cd $(@D) && \
 	$(LN_S) ../../bin/InferClang $(@F)
 
+$(BIN_DIR):
+	$(MKDIR_P) $@
 
-$(INFERTRACEBUGS_BIN_RELPATH): Makefile
+$(INFERTRACEBUGS_BIN_RELPATH): Makefile $(BIN_DIR)
 	$(REMOVE) $@ && \
 	cd $(@D) && \
 	$(LN_S) ../lib/python/$(@F) $(@F)
diff --git a/infer/bin/inferTest b/infer/bin/inferTest
deleted file mode 100755
index d7135932e..000000000
--- a/infer/bin/inferTest
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash -e
-
-# Copyright (c) 2013 - present Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the BSD style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
-
-# This script takes a buck target and runs the respective tests.
-
-# Arguments:
-# $1 : buck target
-# [$2] : "keep" or "replace". Keep will keep the temporary folders used in the tests.
-#         Replace will replace the saved dot files with the new created ones.
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd -P )"
-
-cd $SCRIPT_DIR/../../
-
-case $2 in
-    keep)
-        INFER_KEEP_FOLDER=Y buck test --no-results-cache $1 ;;
-    replace)
-        INFER_DOT_REPLACE=Y buck test --no-results-cache $1 ;;
-    *)
-        buck test --no-results-cache $1 ;;
-esac