diff --git a/hphp/test/CMakeLists.txt b/hphp/test/CMakeLists.txt
index 2313f0465..771477d35 100644
--- a/hphp/test/CMakeLists.txt
+++ b/hphp/test/CMakeLists.txt
@@ -15,7 +15,6 @@ list(APPEND CXX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../hhvm/global_variables.cp
 add_definitions(-DHPHPI_PATH="hphpi/hphpi")
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_base_suite.inc ${CMAKE_CURRENT_SOURCE_DIR}/test_suite.inc COPYONLY)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_base_fast.inc ${CMAKE_CURRENT_SOURCE_DIR}/test_fast.inc COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dummy_mysql_info.inc ${CMAKE_CURRENT_SOURCE_DIR}/test_mysql_info.inc COPYONLY)
 
 add_executable(test ${CXX_SOURCES})
diff --git a/hphp/test/test_all.cpp b/hphp/test/test_all.cpp
index 217db504a..f708e1077 100644
--- a/hphp/test/test_all.cpp
+++ b/hphp/test/test_all.cpp
@@ -68,11 +68,12 @@ void Test::RunTestsImpl(bool &allPassed, std::string &suite,
     RUN_TESTSUITE(TestServer);
     return;
   }
-  // QuickTests
-  if (set != "TestExt") {
-#include <test/test_base_fast.inc>
-  }
-  if (set == "QuickTests") {
+  if (set == "TestUnit") {
+    RUN_TESTSUITE(TestParserExpr);
+    RUN_TESTSUITE(TestParserStmt);
+    RUN_TESTSUITE(TestCodeError);
+    RUN_TESTSUITE(TestUtil);
+    RUN_TESTSUITE(TestCppBase);
     return;
   }
 
diff --git a/hphp/test/test_base_fast.inc b/hphp/test/test_base_fast.inc
deleted file mode 100644
index 26c8fff78..000000000
--- a/hphp/test/test_base_fast.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-RUN_TESTSUITE(TestParserExpr);
-RUN_TESTSUITE(TestParserStmt);
-RUN_TESTSUITE(TestCodeError);
-RUN_TESTSUITE(TestUtil);
-RUN_TESTSUITE(TestCppBase);