diff --git a/Source/UnitTests/CMakeLists.txt b/Source/UnitTests/CMakeLists.txt
index a60fa05996..4f97ce5793 100644
--- a/Source/UnitTests/CMakeLists.txt
+++ b/Source/UnitTests/CMakeLists.txt
@@ -11,7 +11,7 @@ file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Tests)
 # Otherwise CMake inserts the library after core, but before other core
 # dependencies like videocommon which also use Host_ functions, which makes the
 # GNU linker complain.
-add_library(unittests_stubhost OBJECT TestUtils/StubHost.cpp)
+add_library(unittests_stubhost OBJECT StubHost.cpp)
 
 macro(add_dolphin_test target)
   add_executable(${target} EXCLUDE_FROM_ALL
@@ -27,8 +27,6 @@ macro(add_dolphin_test target)
   add_test(NAME ${target} COMMAND ${target})
 endmacro()
 
-add_subdirectory(TestUtils)
-
 add_subdirectory(Common)
 add_subdirectory(Core)
 add_subdirectory(VideoCommon)
diff --git a/Source/UnitTests/TestUtils/StubHost.cpp b/Source/UnitTests/StubHost.cpp
similarity index 100%
rename from Source/UnitTests/TestUtils/StubHost.cpp
rename to Source/UnitTests/StubHost.cpp
diff --git a/Source/UnitTests/TestUtils/CMakeLists.txt b/Source/UnitTests/TestUtils/CMakeLists.txt
deleted file mode 100644
index 79424a42a6..0000000000
--- a/Source/UnitTests/TestUtils/CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-set(SRCS
-	# Do not add StubHost.cpp here - it is added manually via add_dolphin_test.
-	)
-
-set(LIBS
-	)
-
-# TODO: uncomment when there is actually something here.
-#add_dolphin_library(testutils "${SRCS}" "${LIBS}")
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 9c91baf8c0..27cc4992d0 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -60,6 +60,7 @@
     <ClCompile Include="$(ExternalsDir)gtest\src\gtest-all.cc" />
     <ClCompile Include="$(ExternalsDir)gtest\src\gtest_main.cc" />
     <!--Lump all of the tests (and supporting code) into one binary-->
+    <ClCompile Include="*.cpp" />
     <ClCompile Include="*\*.cpp" />
   </ItemGroup>
   <ItemGroup>
@@ -111,4 +112,4 @@
     <!--This is only executed via msbuild, VS test runner automatically does this-->
     <Exec Command="$(TargetPath)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>