diff --git a/Common/Common.vcxproj b/Common/Common.vcxproj
index 97eeda9d..6cb0f9f5 100644
--- a/Common/Common.vcxproj
+++ b/Common/Common.vcxproj
@@ -37,6 +37,7 @@
     <ClInclude Include="Platform.h" />
     <ClInclude Include="RawString.h" />
     <ClInclude Include="StringUtil.h" />
+    <ClInclude Include="UnitTest.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/Common/Common.vcxproj.filters b/Common/Common.vcxproj.filters
index 2f4f152e..ba792afa 100644
--- a/Common/Common.vcxproj.filters
+++ b/Common/Common.vcxproj.filters
@@ -18,5 +18,6 @@
     <ClInclude Include="StringUtil.h" />
     <ClInclude Include="ControlTemplate.h" />
     <ClInclude Include="MathParser.h" />
+    <ClInclude Include="UnitTest.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Common/Gfx/TextFormatD2D_Test.cpp b/Common/Gfx/TextFormatD2D_Test.cpp
index ca95272b..f36d6c96 100644
--- a/Common/Gfx/TextFormatD2D_Test.cpp
+++ b/Common/Gfx/TextFormatD2D_Test.cpp
@@ -18,11 +18,9 @@
 
 #include "Canvas.h"
 #include "TextFormatD2D.h"
-#include <CppUnitTest.h>
+#include "../UnitTest.h"
 #include <memory>
 
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
 namespace Gfx {
 
 TEST_CLASS(Common_Gfx_TextFormatD2D_Test)
diff --git a/Common/MathParser_Test.cpp b/Common/MathParser_Test.cpp
index 86b54fb2..a1325ef2 100644
--- a/Common/MathParser_Test.cpp
+++ b/Common/MathParser_Test.cpp
@@ -17,9 +17,7 @@
 */
 
 #include "MathParser.h"
-#include <CppUnitTest.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+#include "UnitTest.h"
 
 namespace MathParser {
 
diff --git a/Common/PathUtil_Test.cpp b/Common/PathUtil_Test.cpp
index 04eb3fda..f5e51241 100644
--- a/Common/PathUtil_Test.cpp
+++ b/Common/PathUtil_Test.cpp
@@ -17,11 +17,9 @@
 */
 
 #include "PathUtil.h"
-#include <CppUnitTest.h>
+#include "UnitTest.h"
 #include <Shlobj.h>
 
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-
 namespace PathUtil {
 
 TEST_CLASS(Common_PathUtil_Test)
diff --git a/Common/StringUtil_Test.cpp b/Common/StringUtil_Test.cpp
index 626f11d0..37863375 100644
--- a/Common/StringUtil_Test.cpp
+++ b/Common/StringUtil_Test.cpp
@@ -17,9 +17,7 @@
 */
 
 #include "StringUtil.h"
-#include <CppUnitTest.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+#include "UnitTest.h"
 
 namespace StringUtil {
 
diff --git a/Library/ConfigParser_Test.cpp b/Library/ConfigParser_Test.cpp
index a3efdbbe..96dd2b4f 100644
--- a/Library/ConfigParser_Test.cpp
+++ b/Library/ConfigParser_Test.cpp
@@ -17,9 +17,7 @@
 */
 
 #include "ConfigParser.h"
-#include <CppUnitTest.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+#include "../Common/UnitTest.h"
 
 TEST_CLASS(Library_ConfigParser_Test)
 {
diff --git a/Library/SkinRegistry_Test.cpp b/Library/SkinRegistry_Test.cpp
index a145d5c8..3458640e 100644
--- a/Library/SkinRegistry_Test.cpp
+++ b/Library/SkinRegistry_Test.cpp
@@ -17,9 +17,7 @@
 */
 
 #include "SkinRegistry.h"
-#include <CppUnitTest.h>
-
-using namespace Microsoft::VisualStudio::CppUnitTestFramework;
+#include "../Common/UnitTest.h"
 
 TEST_CLASS(Library_SkinRegistry_Test)
 {