diff --git a/Makefile b/Makefile
index 146da1c18..f50c0e5ed 100644
--- a/Makefile
+++ b/Makefile
@@ -301,7 +301,7 @@ clang_plugin: clang_setup
 
 .PHONY: clang_plugin_test
 clang_plugin_test: clang_setup
-		$(QUIET)$(call silent_on_success,Running clang plugin tests,\
+		$(QUIET)$(call silent_on_success,Running facebook-clang-plugins/libtooling/ tests,\
 		$(MAKE) -C $(FCP_DIR)/libtooling test \
 		  CC=$(CC) CXX=$(CXX) \
 		  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
@@ -309,6 +309,33 @@ clang_plugin_test: clang_setup
 		  LOCAL_CLANG=$(CLANG_PREFIX)/bin/clang \
 		  CLANG_PREFIX=$(CLANG_PREFIX) \
 		  CLANG_INCLUDES=$(CLANG_INCLUDES))
+		$(QUIET)$(call silent_on_success,Running facebook-clang-plugins/clang-ocaml/ tests,\
+		$(MAKE) -C $(FCP_DIR)/clang-ocaml test \
+		  CC=$(CC) CXX=$(CXX) \
+		  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		  CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+		  LOCAL_CLANG=$(CLANG_PREFIX)/bin/clang \
+		  CLANG_PREFIX=$(CLANG_PREFIX) \
+		  CLANG_INCLUDES=$(CLANG_INCLUDES))
+
+.PHONY: clang_plugin_test
+clang_plugin_test_replace: clang_setup
+		$(QUIET)$(call silent_on_success,Running facebook-clang-plugins/libtooling/ record tests,\
+		$(MAKE) -C $(FCP_DIR)/libtooling record-test-outputs \
+		  CC=$(CC) CXX=$(CXX) \
+		  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		  CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+		  LOCAL_CLANG=$(CLANG_PREFIX)/bin/clang \
+		  CLANG_PREFIX=$(CLANG_PREFIX) \
+		  CLANG_INCLUDES=$(CLANG_INCLUDES))
+		$(QUIET)$(call silent_on_success,Running facebook-clang-plugins/clang-ocaml/ record tests,\
+		$(MAKE) -C $(FCP_DIR)/clang-ocaml record-test-outputs \
+		  CC=$(CC) CXX=$(CXX) \
+		  CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		  CPP="$(CPP)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" \
+		  LOCAL_CLANG=$(CLANG_PREFIX)/bin/clang \
+		  CLANG_PREFIX=$(CLANG_PREFIX) \
+		  CLANG_INCLUDES=$(CLANG_INCLUDES))
 
 .PHONY: ocaml_unit_test
 ocaml_unit_test: test_build
@@ -450,7 +477,8 @@ endif
 quick-test: test_build ocaml_unit_test
 
 .PHONY: test-replace
-test-replace: $(BUILD_SYSTEMS_TESTS:%=build_%_replace) $(DIRECT_TESTS:%=direct_%_replace)
+test-replace: $(BUILD_SYSTEMS_TESTS:%=build_%_replace) $(DIRECT_TESTS:%=direct_%_replace) \
+              clang_plugin_test_replace
 
 .PHONY: uninstall
 uninstall:
diff --git a/facebook-clang-plugins b/facebook-clang-plugins
index 4639c488b..e985de5d5 160000
--- a/facebook-clang-plugins
+++ b/facebook-clang-plugins
@@ -1 +1 @@
-Subproject commit 4639c488b03664535401440a4e0bfc2f17d851d5
+Subproject commit e985de5d5187402d5220195a8905d4d9168e7700