diff --git a/Source/UnitTests/Common/CMakeLists.txt b/Source/UnitTests/Common/CMakeLists.txt
index 86d9dedfcf..2d30517614 100644
--- a/Source/UnitTests/Common/CMakeLists.txt
+++ b/Source/UnitTests/Common/CMakeLists.txt
@@ -7,6 +7,7 @@ add_dolphin_test(CommonFuncsTest CommonFuncsTest.cpp)
 add_dolphin_test(CryptoEcTest Crypto/EcTest.cpp)
 add_dolphin_test(EnumFormatterTest EnumFormatterTest.cpp)
 add_dolphin_test(EventTest EventTest.cpp)
+add_dolphin_test(FileUtilTest FileUtilTest.cpp)
 add_dolphin_test(FixedSizeQueueTest FixedSizeQueueTest.cpp)
 add_dolphin_test(FlagTest FlagTest.cpp)
 add_dolphin_test(FloatUtilsTest FloatUtilsTest.cpp)
diff --git a/Source/UnitTests/FileUtil.cpp b/Source/UnitTests/Common/FileUtilTest.cpp
similarity index 100%
rename from Source/UnitTests/FileUtil.cpp
rename to Source/UnitTests/Common/FileUtilTest.cpp
diff --git a/Source/UnitTests/Core/CMakeLists.txt b/Source/UnitTests/Core/CMakeLists.txt
index 1ea9bee6fb..c834ef82c3 100644
--- a/Source/UnitTests/Core/CMakeLists.txt
+++ b/Source/UnitTests/Core/CMakeLists.txt
@@ -16,12 +16,18 @@ add_dolphin_test(FileSystemTest IOS/FS/FileSystemTest.cpp)
 
 if(_M_X86)
   add_dolphin_test(PowerPCTest
+    PowerPC/DivUtilsTest.cpp
     PowerPC/Jit64Common/ConvertDoubleToSingle.cpp
     PowerPC/Jit64Common/Frsqrte.cpp
   )
 elseif(_M_ARM_64)
   add_dolphin_test(PowerPCTest
+    PowerPC/DivUtilsTest.cpp
     PowerPC/JitArm64/ConvertSingleDouble.cpp
     PowerPC/JitArm64/MovI2R.cpp
   )
+else()
+  add_dolphin_test(PowerPCTest
+    PowerPC/DivUtilsTest.cpp
+  )
 endif()
diff --git a/Source/UnitTests/DivUtilsTest.cpp b/Source/UnitTests/Core/PowerPC/DivUtilsTest.cpp
similarity index 100%
rename from Source/UnitTests/DivUtilsTest.cpp
rename to Source/UnitTests/Core/PowerPC/DivUtilsTest.cpp
diff --git a/Source/UnitTests/UnitTests.vcxproj b/Source/UnitTests/UnitTests.vcxproj
index 697625be2a..6c2ee826a3 100644
--- a/Source/UnitTests/UnitTests.vcxproj
+++ b/Source/UnitTests/UnitTests.vcxproj
@@ -51,6 +51,7 @@
     <ClCompile Include="Common\Crypto\EcTest.cpp" />
     <ClCompile Include="Common\EnumFormatterTest.cpp" />
     <ClCompile Include="Common\EventTest.cpp" />
+    <ClCompile Include="Common\FileUtilTest.cpp" />
     <ClCompile Include="Common\FixedSizeQueueTest.cpp" />
     <ClCompile Include="Common\FlagTest.cpp" />
     <ClCompile Include="Common\FloatUtilsTest.cpp" />
@@ -69,8 +70,7 @@
     <ClCompile Include="Core\IOS\FS\FileSystemTest.cpp" />
     <ClCompile Include="Core\MMIOTest.cpp" />
     <ClCompile Include="Core\PageFaultTest.cpp" />
-    <ClCompile Include="DivUtilsTest.cpp" />
-    <ClCompile Include="FileUtil.cpp" />
+    <ClCompile Include="Core\PowerPC\DivUtilsTest.cpp" />
     <ClCompile Include="VideoCommon\VertexLoaderTest.cpp" />
     <ClCompile Include="StubHost.cpp" />
   </ItemGroup>