diff --git a/UWP/.gitignore b/UWP/.gitignore
index a20501d06d..f62c9b42e8 100644
--- a/UWP/.gitignore
+++ b/UWP/.gitignore
@@ -4,3 +4,4 @@ Package.appxmanifest
 Assets
 x64
 *.VC.db
+*.VC.VC.opendb
diff --git a/UWP/PPSSPP_UWP.sln b/UWP/PPSSPP_UWP.sln
index e2427c75ac..1b251ca1c7 100644
--- a/UWP/PPSSPP_UWP.sln
+++ b/UWP/PPSSPP_UWP.sln
@@ -30,9 +30,6 @@ Global
 		Release|ARM = Release|ARM
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
-		Tests|ARM = Tests|ARM
-		Tests|Win32 = Tests|Win32
-		Tests|x64 = Tests|x64
 		UWP Gold|ARM = UWP Gold|ARM
 		UWP Gold|Win32 = UWP Gold|Win32
 		UWP Gold|x64 = UWP Gold|x64
@@ -50,12 +47,6 @@ Global
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|Win32.Build.0 = Release|Win32
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.ActiveCfg = Release|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Release|x64.Build.0 = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|ARM.ActiveCfg = Release|ARM
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|ARM.Build.0 = Release|ARM
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|Win32.ActiveCfg = Release|Win32
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|Win32.Build.0 = Release|Win32
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|x64.ActiveCfg = Release|x64
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.Tests|x64.Build.0 = Release|x64
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -74,12 +65,6 @@ Global
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|Win32.Build.0 = Release|Win32
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.ActiveCfg = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.Release|x64.Build.0 = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|ARM.ActiveCfg = Release|ARM
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|ARM.Build.0 = Release|ARM
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|Win32.ActiveCfg = Release|Win32
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|Win32.Build.0 = Release|Win32
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|x64.ActiveCfg = Release|x64
-		{40B76674-02DE-40EF-889B-FAD1489685E7}.Tests|x64.Build.0 = Release|x64
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{40B76674-02DE-40EF-889B-FAD1489685E7}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -98,12 +83,6 @@ Global
 		{5D271429-C288-4534-98AF-94475D940058}.Release|Win32.Build.0 = Release|Win32
 		{5D271429-C288-4534-98AF-94475D940058}.Release|x64.ActiveCfg = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.Release|x64.Build.0 = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|ARM.ActiveCfg = Release|ARM
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|ARM.Build.0 = Release|ARM
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|Win32.ActiveCfg = Release|Win32
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|Win32.Build.0 = Release|Win32
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|x64.ActiveCfg = Release|x64
-		{5D271429-C288-4534-98AF-94475D940058}.Tests|x64.Build.0 = Release|x64
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{5D271429-C288-4534-98AF-94475D940058}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -122,12 +101,6 @@ Global
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|Win32.Build.0 = Release|Win32
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|x64.ActiveCfg = Release|x64
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Release|x64.Build.0 = Release|x64
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|ARM.ActiveCfg = Release|ARM
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|ARM.Build.0 = Release|ARM
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|Win32.ActiveCfg = Release|Win32
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|Win32.Build.0 = Release|Win32
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|x64.ActiveCfg = Release|x64
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.Tests|x64.Build.0 = Release|x64
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{935028AF-B850-4AD7-A00E-7BA84FB97D05}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -146,12 +119,6 @@ Global
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|Win32.Build.0 = Release|Win32
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.ActiveCfg = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Release|x64.Build.0 = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|ARM.ActiveCfg = Release|ARM
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|ARM.Build.0 = Release|ARM
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|Win32.ActiveCfg = Release|Win32
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|Win32.Build.0 = Release|Win32
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|x64.ActiveCfg = Release|x64
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.Tests|x64.Build.0 = Release|x64
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -170,12 +137,6 @@ Global
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|Win32.Build.0 = Release|Win32
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.ActiveCfg = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Release|x64.Build.0 = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|ARM.ActiveCfg = Release|ARM
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|ARM.Build.0 = Release|ARM
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|Win32.ActiveCfg = Release|Win32
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|Win32.Build.0 = Release|Win32
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|x64.ActiveCfg = Release|x64
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.Tests|x64.Build.0 = Release|x64
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{2F911C05-B341-4291-8BF5-09EDECBDD5F5}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -194,12 +155,6 @@ Global
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|Win32.Build.0 = Release|Win32
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.ActiveCfg = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Release|x64.Build.0 = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|ARM.ActiveCfg = Release|ARM
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|ARM.Build.0 = Release|ARM
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|Win32.ActiveCfg = Release|Win32
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|Win32.Build.0 = Release|Win32
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|x64.ActiveCfg = Release|x64
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.Tests|x64.Build.0 = Release|x64
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{DDF90203-0AAE-4F38-B589-2E9637658CE6}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -224,15 +179,6 @@ Global
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.ActiveCfg = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.Build.0 = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Release|x64.Deploy.0 = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|ARM.ActiveCfg = Release|ARM
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|ARM.Build.0 = Release|ARM
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|ARM.Deploy.0 = Release|ARM
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|Win32.ActiveCfg = Release|Win32
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|Win32.Build.0 = Release|Win32
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|Win32.Deploy.0 = Release|Win32
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|x64.ActiveCfg = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|x64.Build.0 = Release|x64
-		{01D7D581-09A3-4A26-94BD-A7C529B29329}.Tests|x64.Deploy.0 = Release|x64
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{01D7D581-09A3-4A26-94BD-A7C529B29329}.UWP Gold|ARM.Deploy.0 = UWP Gold|ARM
@@ -254,12 +200,6 @@ Global
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|Win32.Build.0 = Release|Win32
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.ActiveCfg = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Release|x64.Build.0 = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|ARM.ActiveCfg = Release|ARM
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|ARM.Build.0 = Release|ARM
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|Win32.ActiveCfg = Release|Win32
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|Win32.Build.0 = Release|Win32
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|x64.ActiveCfg = Release|x64
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.Tests|x64.Build.0 = Release|x64
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -278,12 +218,6 @@ Global
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|Win32.Build.0 = Release|Win32
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.ActiveCfg = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Release|x64.Build.0 = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|ARM.ActiveCfg = Release|ARM
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|ARM.Build.0 = Release|ARM
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|Win32.ActiveCfg = Release|Win32
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|Win32.Build.0 = Release|Win32
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|x64.ActiveCfg = Release|x64
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.Tests|x64.Build.0 = Release|x64
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.ActiveCfg = UWP Gold|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|ARM.Build.0 = UWP Gold|ARM
 		{2B2D16BD-1D37-46AF-A3F8-552900951B26}.UWP Gold|Win32.ActiveCfg = UWP Gold|Win32
@@ -294,16 +228,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{ACB316CA-3ECB-48E5-BE0A-91E72D5B0F12} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{40B76674-02DE-40EF-889B-FAD1489685E7} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{5D271429-C288-4534-98AF-94475D940058} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{935028AF-B850-4AD7-A00E-7BA84FB97D05} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{5FAC15BD-7397-4512-99D5-66CDC03AF5B7} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{2F911C05-B341-4291-8BF5-09EDECBDD5F5} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{DDF90203-0AAE-4F38-B589-2E9637658CE6} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{01D7D581-09A3-4A26-94BD-A7C529B29329} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{D326891E-ECE4-4B94-B5E7-8AA0A8E8ECBC} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-		{2B2D16BD-1D37-46AF-A3F8-552900951B26} = {13ED48E6-7BC8-474F-8A8D-195B57921353}
-	EndGlobalSection
 EndGlobal
diff --git a/UWP/build_uwp.proj b/UWP/build_uwp.proj
new file mode 100644
index 0000000000..57ffa9b2aa
--- /dev/null
+++ b/UWP/build_uwp.proj
@@ -0,0 +1,19 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Both">
+  <Target Name="Both">
+    <MSBuild Projects="PPSSPP_UWP.sln"
+      Targets="PPSSPPWindows:Rebuild"
+      Properties="Configuration=Release;Platform=Win32"
+      StopOnFirstFailure="true">
+    </MSBuild>
+    <MSBuild Projects="PPSSPP_UWP.sln"
+      Targets="PPSSPPWindows:Rebuild"
+      Properties="Configuration=Release;Platform=x64"
+      StopOnFirstFailure="true">
+    </MSBuild>
+    <MSBuild Projects="PPSSPP_UWP.sln"
+      Targets="PPSSPPWindows:Rebuild"
+      Properties="Configuration=Release;Platform=ARM"
+      StopOnFirstFailure="true">
+    </MSBuild>
+  </Target>
+</Project>
\ No newline at end of file