diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index ac2043ccff..62355aacdc 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -59,16 +59,51 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="Core\DSP\DSPTestBinary.h" />
+    <ClInclude Include="Core\DSP\DSPTestText.h" />
+    <ClInclude Include="Core\DSP\HermesBinary.h" />
+    <ClInclude Include="Core\IOS\ES\TestBinaryData.h" />
+  </ItemGroup>
   <ItemGroup>
     <!--gtest is rather small, so just include it into the build here-->
     <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">
-      <ExcludedFromBuild Condition="'$(Platform)'!='x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="*\*\*.cpp" />
+    <ClCompile Include="Common\BitFieldTest.cpp" />
+    <ClCompile Include="Common\BitSetTest.cpp" />
+    <ClCompile Include="Common\BitUtilsTest.cpp" />
+    <ClCompile Include="Common\BlockingLoopTest.cpp" />
+    <ClCompile Include="Common\BusyLoopTest.cpp" />
+    <ClCompile Include="Common\CommonFuncsTest.cpp" />
+    <ClCompile Include="Common\Crypto\EcTest.cpp" />
+    <ClCompile Include="Common\EventTest.cpp" />
+    <ClCompile Include="Common\FixedSizeQueueTest.cpp" />
+    <ClCompile Include="Common\FlagTest.cpp" />
+    <ClCompile Include="Common\FloatUtilsTest.cpp" />
+    <ClCompile Include="Common\MathUtilTest.cpp" />
+    <ClCompile Include="Common\NandPathsTest.cpp" />
+    <ClCompile Include="Common\SPSCQueueTest.cpp" />
+    <ClCompile Include="Common\StringUtilTest.cpp" />
+    <ClCompile Include="Common\SwapTest.cpp" />
+    <ClCompile Include="Core\CoreTimingTest.cpp" />
+    <ClCompile Include="Core\DSP\DSPAcceleratorTest.cpp" />
+    <ClCompile Include="Core\DSP\DSPAssemblyTest.cpp" />
+    <ClCompile Include="Core\DSP\DSPTestBinary.cpp" />
+    <ClCompile Include="Core\DSP\DSPTestText.cpp" />
+    <ClCompile Include="Core\DSP\HermesBinary.cpp" />
+    <ClCompile Include="Core\IOS\ES\FormatsTest.cpp" />
+    <ClCompile Include="Core\IOS\FS\FileSystemTest.cpp" />
+    <ClCompile Include="Core\MMIOTest.cpp" />
+    <ClCompile Include="Core\PageFaultTest.cpp" />
+    <ClCompile Include="VideoCommon\VertexLoaderTest.cpp" />
+    <ClCompile Include="StubHost.cpp" />
+  </ItemGroup>
+  <!--Arch-specific tests-->
+  <ItemGroup Condition="'$(Platform)'=='x64'">
+    <ClCompile Include="Common\x64EmitterTest.cpp" />
+    <ClCompile Include="Core\PowerPC\Jit64Common\ConvertDoubleToSingle.cpp" />
+    <ClCompile Include="Core\PowerPC\Jit64Common\Frsqrte.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
@@ -106,4 +141,4 @@
     <!--This is only executed via msbuild, VS test runner automatically does this-->
     <Exec Command="$(TargetPath)" />
   </Target>
-</Project>
+</Project>
\ No newline at end of file