diff --git a/Makefile.config.in b/Makefile.config.in
index 1080719c0..67106197b 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -22,6 +22,7 @@ FCP_CLANG_OCAML_DIR = $(FCP_DIR)/clang-ocaml
 
 ANNOTATIONS_DIR = $(INFER_DIR)/annotations
 BIN_DIR = $(INFER_DIR)/bin
+BUILD_DIR = $(INFER_DIR)/_build
 LIB_DIR = $(INFER_DIR)/lib
 MODELS_DIR = $(INFER_DIR)/models
 SRC_DIR = $(INFER_DIR)/src
diff --git a/Makefile.in b/Makefile.in
index 5e5db9f79..2226b7429 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -74,25 +74,30 @@ endif
 
 inferTraceBugs: $(INFERTRACEBUGS_BIN_RELPATH)
 
-test_build: clang_plugin
+test_this_build: clang_plugin
 	$(MAKE) -C $(SRC_DIR) test_build
 
+test_oss_build: clang_plugin
+# make sure we don't break the opensource build
+	$(MAKE) -C $(SRC_DIR) EXTRA_DEPS=opensource LLVM_BUILD_DIR=$(BUILD_DIR)/llvm_opensource TEST_BUILD_DIR=$(BUILD_DIR)/opensource test_build
+
+test_build: test_this_build
+ifeq (@IS_FACEBOOK_TREE@,yes)
+test_build: test_oss_build
+endif
+
 ocaml_unit_test: infer
 	$(INFERUNIT_BIN)
 
 buck_test: infer
 	NO_BUCKD=1 buck clean
 	NO_BUCKD=1 buck test $(TARGETS_TO_TEST)
-ifeq (@BUILD_JAVA_ANALYZERS@,yes)
 	NO_BUCKD=1 ./infer/tests/build_systems/build_integration_tests.py
-endif
 
 buck_test_xml: infer
 	NO_BUCKD=1 buck clean
 	NO_BUCKD=1 buck test --xml test.xml $(TARGETS_TO_TEST)
-ifeq (@BUILD_JAVA_ANALYZERS@,yes)
 	NO_BUCKD=1 ./infer/tests/build_systems/build_integration_tests.py
-endif
 
 inferTraceBugs_test: infer
 	$(INFER_BIN) -o __test-infer-out__ -- \
diff --git a/infer/src/Makefile.in b/infer/src/Makefile.in
index 41baa7ebe..a8be488b8 100644
--- a/infer/src/Makefile.in
+++ b/infer/src/Makefile.in
@@ -17,7 +17,6 @@ ATDGEN = @ATDGEN@
 
 #### Global declarations ####
 
-BUILD_DIR = $(INFER_DIR)/_build
 INFER_BUILD_DIR = $(BUILD_DIR)/infer
 TEST_BUILD_DIR = $(BUILD_DIR)/test
 LLVM_BUILD_DIR = $(BUILD_DIR)/llvm
@@ -121,13 +120,12 @@ CHECKCOPYRIGHT_MAIN = $(SCRIPT_SOURCES)/checkCopyright
 #### End of declarations ####
 
 ifeq (@IS_FACEBOOK_TREE@,yes)
-EXTRA_DEPS = facebook
+EXTRA_DEPS = facebook facebook/checkers facebook/checkers/graphql facebook/scripts
 else
 EXTRA_DEPS = opensource
 endif
 
-DEPENDENCIES = IR backend checkers eradicate harness \
-	facebook/checkers facebook/checkers/graphql facebook/scripts $(EXTRA_DEPS)
+DEPENDENCIES = IR backend checkers eradicate harness $(EXTRA_DEPS)
 
 # ocamlbuild command with options common to all build targets
 OCAMLBUILD_BASE = rebuild $(OCAMLBUILD_OPTIONS) -j $(NCPU) $(addprefix -I , $(DEPENDENCIES))