diff --git a/hphp/test/CMakeLists.txt b/hphp/test/CMakeLists.txt
index c9b347f70..440117cb5 100644
--- a/hphp/test/CMakeLists.txt
+++ b/hphp/test/CMakeLists.txt
@@ -1,12 +1,11 @@
 set(CXX_SOURCES)
 
-set(RECURSIVE_SOURCE_SUBDIRS vm)
+set(RECURSIVE_SOURCE_SUBDIRS ext)
 foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})
 	auto_sources(files "*.cpp" "RECURSE" "${CMAKE_CURRENT_SOURCE_DIR}/${dir}")
 	list(APPEND CXX_SOURCES ${files})
 endforeach(dir ${RECURSIVE_SOURCE_SUBDIRS})
 
-auto_sources(files "*.cpp" "")
 list(APPEND CXX_SOURCES ${files})
 list(APPEND CXX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../hhvm/process_init.cpp")
 list(APPEND CXX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../hhvm/global_variables.cpp")
diff --git a/hphp/test/ext/test_ext.inc b/hphp/test/ext/test_ext.inc
new file mode 100644
index 000000000..36c58ef65
--- /dev/null
+++ b/hphp/test/ext/test_ext.inc
@@ -0,0 +1,15 @@
+
+/*
+ * TestExt is mostly deprecated.
+ *
+ * Please don't add new extension tests here if they are possible to
+ * write in php.
+ *
+ * The tests below still remain in C++ generally because they start
+ * temporary servers, which is easier from C++.
+ */
+
+RUN_TESTSUITE(TestExtCurl);
+RUN_TESTSUITE(TestExtMemcached);
+RUN_TESTSUITE(TestExtMysql);
+RUN_TESTSUITE(TestExtServer);
diff --git a/hphp/test/test_mysql_info.h b/hphp/test/ext/test_mysql_info.h
similarity index 100%
rename from hphp/test/test_mysql_info.h
rename to hphp/test/ext/test_mysql_info.h