diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93b784b462..69ea0b7fd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -180,6 +180,7 @@ add_subdirectory(tools)
 
 if (BUILD_TESTS)
   add_subdirectory(tests)
+  add_subdirectory(tests-manual)
 endif()
 
 if (BUILD_INSTALLER)
diff --git a/tests-manual/CMakeLists.txt b/tests-manual/CMakeLists.txt
new file mode 100644
index 0000000000..bc64183298
--- /dev/null
+++ b/tests-manual/CMakeLists.txt
@@ -0,0 +1,8 @@
+# add the manual test directories
+file(GLOB TEST_SUBDIRS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*")
+foreach(DIR ${TEST_SUBDIRS})
+  if((IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}") AND (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}/CMakeLists.txt"))
+    set(TEST_PROJ_NAME ${DIR})
+    add_subdirectory(${DIR})
+  endif()
+endforeach()
diff --git a/tests-manual/qt59/CMakeLists.txt b/tests-manual/qt59/CMakeLists.txt
deleted file mode 100644
index e3450ae069..0000000000
--- a/tests-manual/qt59/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
-set(TARGET_NAME qt59)
-
-if (WIN32)
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ignore:4049 /ignore:4217")
-endif()
-
-setup_memory_debugger()
-
-# This is not a testcase -- just set it up as a regular hifi project
-setup_hifi_project(Gui)
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Tests/manual-tests/")
-
-
-# link in the shared libraries
-link_hifi_libraries(shared networking)
-
-if (WIN32)
-	add_dependency_external_projects(wasapi)
-endif()
-
-package_libraries_for_deployment()
diff --git a/tests-manual/qt59/src/main.cpp b/tests-manual/qt59/src/main.cpp
deleted file mode 100644
index 19b922de9f..0000000000
--- a/tests-manual/qt59/src/main.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-//
-//  Created by Bradley Austin Davis on 2017/06/06
-//  Copyright 2013-2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-#include <mutex>
-
-#include <QtCore/QCoreApplication>
-
-#include <NodeList.h>
-#include <AccountManager.h>
-#include <AddressManager.h>
-#include <MessagesClient.h>
-
-#include <BuildInfo.h>
-
-
-class Qt59TestApp : public QCoreApplication {
-    Q_OBJECT
-public:
-    Qt59TestApp(int argc, char* argv[]);
-    ~Qt59TestApp();
-
-private:
-    void finish(int exitCode);
-};
-
-
-
-Qt59TestApp::Qt59TestApp(int argc, char* argv[]) :
-    QCoreApplication(argc, argv)
-{
-    DependencyManager::registerInheritance<LimitedNodeList, NodeList>();
-    DependencyManager::set<AccountManager>([&] { return QString("Mozilla/5.0 (HighFidelityACClient)"); });
-    DependencyManager::set<AddressManager>();
-    DependencyManager::set<NodeList>(NodeType::Agent, 0);
-    auto nodeList = DependencyManager::get<NodeList>();
-    nodeList->startThread();
-    auto messagesClient = DependencyManager::set<MessagesClient>();
-    messagesClient->startThread();
-    QTimer::singleShot(1000, [this] { finish(0); });
-}
-
-Qt59TestApp::~Qt59TestApp() {
-}
-
-
-void Qt59TestApp::finish(int exitCode) {
-    auto nodeList = DependencyManager::get<NodeList>();
-
-    // send the domain a disconnect packet, force stoppage of domain-server check-ins
-    nodeList->getDomainHandler().disconnect();
-    nodeList->setIsShuttingDown(true);
-    nodeList->getPacketReceiver().setShouldDropPackets(true);
-
-    // remove the NodeList from the DependencyManager
-    DependencyManager::destroy<NodeList>();
-    QCoreApplication::exit(exitCode);
-}
-
-
-int main(int argc, char * argv[]) {
-    setupHifiApplication("Qt59Test");
-
-    Qt59TestApp app(argc, argv);
-
-    return app.exec();
-}
-
-#include "main.moc"
diff --git a/tests-manual/ui/CMakeLists.txt b/tests-manual/ui/CMakeLists.txt
deleted file mode 100644
index 0a5d6796e0..0000000000
--- a/tests-manual/ui/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-# This folder contains code for testing the QML UI using Qt Creator.  It is not intended to be included in the CMake project