diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bcc839a522..9cc90dbd49 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,3 +7,4 @@ endif (CLR_CMAKE_HOST_UNIX)
 add_subdirectory(shared)
 add_subdirectory(SOS)
 add_subdirectory(dbgshim)
+add_subdirectory(tests)
diff --git a/src/SOS/CMakeLists.txt b/src/SOS/CMakeLists.txt
index 901a26e428..79d7eef563 100644
--- a/src/SOS/CMakeLists.txt
+++ b/src/SOS/CMakeLists.txt
@@ -10,13 +10,8 @@ if(CLR_CMAKE_HOST_WIN32)
 
   message(STATUS "VSInstallDir: $ENV{VSInstallDir}")
   include_directories("$ENV{VSInstallDir}/DIA SDK/include")
-
+  
   add_compile_options(/Zl) # omit default library name in .OBJ
-
-  add_subdirectory(runcommand)
-  if(NOT CLR_CMAKE_TARGET_ARCH_ARM)
-    add_subdirectory(SOS.UnitTests/Debuggees/DesktopClrHost)
-  endif(NOT CLR_CMAKE_TARGET_ARCH_ARM)
 endif(CLR_CMAKE_HOST_WIN32)
 
 add_compile_definitions(STRESS_LOG_ANALYZER)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
new file mode 100644
index 0000000000..bf31588276
--- /dev/null
+++ b/src/tests/CMakeLists.txt
@@ -0,0 +1,9 @@
+include(${CLR_SHARED_DIR}/shared.cmake)
+
+if(CLR_CMAKE_HOST_WIN32)
+  # test helpers used by SOS tests
+  add_subdirectory(runcommand)
+  if(NOT CLR_CMAKE_TARGET_ARCH_ARM)
+    add_subdirectory(DesktopClrHost)
+  endif(NOT CLR_CMAKE_TARGET_ARCH_ARM)
+endif(CLR_CMAKE_HOST_WIN32)
diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt b/src/tests/DesktopClrHost/CMakeLists.txt
similarity index 93%
rename from src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
rename to src/tests/DesktopClrHost/CMakeLists.txt
index 567493fa1e..0c2facfd78 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
+++ b/src/tests/DesktopClrHost/CMakeLists.txt
@@ -2,11 +2,12 @@ project(DesktopClrHost)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-include_directories(inc)
 include_directories("$ENV{VSInstallDir}/DIA SDK/include")
 
 add_definitions(-DUSE_STL)
 
+add_compile_options(/Zl) # omit default library name in .OBJ
+
 set(DESKTOPCLRHOST_SOURCES
     DesktopClrHost.cpp
 )
diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/DesktopClrHost.cpp b/src/tests/DesktopClrHost/DesktopClrHost.cpp
similarity index 100%
rename from src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/DesktopClrHost.cpp
rename to src/tests/DesktopClrHost/DesktopClrHost.cpp
diff --git a/src/SOS/runcommand/CMakeLists.txt b/src/tests/runcommand/CMakeLists.txt
similarity index 96%
rename from src/SOS/runcommand/CMakeLists.txt
rename to src/tests/runcommand/CMakeLists.txt
index c9b492de8a..a52c56da3f 100644
--- a/src/SOS/runcommand/CMakeLists.txt
+++ b/src/tests/runcommand/CMakeLists.txt
@@ -2,7 +2,6 @@ project(runcommand)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-include_directories(inc)
 include_directories("$ENV{VSInstallDir}/DIA SDK/include")
 
 add_definitions(-DUSE_STL)
diff --git a/src/SOS/runcommand/runcommand.cpp b/src/tests/runcommand/runcommand.cpp
similarity index 100%
rename from src/SOS/runcommand/runcommand.cpp
rename to src/tests/runcommand/runcommand.cpp