diff --git a/Source/Dolphin.sln b/Source/Dolphin.sln
index 03e769a660..f4fc64f2da 100644
--- a/Source/Dolphin.sln
+++ b/Source/Dolphin.sln
@@ -113,6 +113,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_DSP_NULL", "Plugins\
 		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_nJoy_SDL_Test", "Plugins\Plugin_nJoy_Testing\Plugin_nJoy_SDL_Test.vcproj", "{ADF64291-57ED-4B7A-AB76-37B4A991504B}"
+	ProjectSection(ProjectDependencies) = postProject
+		{48AD7E0A-25B1-4974-A1E3-03F8C438D34F} = {48AD7E0A-25B1-4974-A1E3-03F8C438D34F}
+		{0318BA30-EF48-441A-9E10-DC85EFAE39F0} = {0318BA30-EF48-441A-9E10-DC85EFAE39F0}
+		{C573CAF7-EE6A-458E-8049-16C0BF34C2E9} = {C573CAF7-EE6A-458E-8049-16C0BF34C2E9}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -349,6 +356,18 @@ Global
 		{C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Release|Win32.Build.0 = Release|Win32
 		{C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Release|x64.ActiveCfg = Release|x64
 		{C6CC7A52-0FDD-433A-B2CF-9C6F187DA807}.Release|x64.Build.0 = Release|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|Win32.Build.0 = Debug|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|x64.ActiveCfg = Debug|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Debug|x64.Build.0 = Debug|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.ActiveCfg = DebugFast|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|Win32.Build.0 = DebugFast|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|x64.ActiveCfg = DebugFast|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.DebugFast|x64.Build.0 = DebugFast|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.ActiveCfg = Release|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|Win32.Build.0 = Release|Win32
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.ActiveCfg = Release|x64
+		{ADF64291-57ED-4B7A-AB76-37B4A991504B}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL.vcproj b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
similarity index 95%
rename from Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL.vcproj
rename to Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
index 7013a57145..53ad61616e 100644
--- a/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL.vcproj
+++ b/Source/Plugins/Plugin_nJoy_Testing/Plugin_nJoy_SDL_Test.vcproj
@@ -2,8 +2,8 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="Plugin_nJoy_SDL"
-	ProjectGUID="{521498BE-6089-4780-8223-E67C22F4E068}"
+	Name="Plugin_nJoy_SDL_Test"
+	ProjectGUID="{ADF64291-57ED-4B7A-AB76-37B4A991504B}"
 	RootNamespace="Plugin_nJoy_SDL"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/AboutBox.os b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/AboutBox.os
deleted file mode 100644
index 65aec0cdc0..0000000000
Binary files a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/AboutBox.os and /dev/null differ
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.os b/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.os
deleted file mode 100644
index 0c96546b79..0000000000
Binary files a/Source/Plugins/Plugin_nJoy_Testing/Src/GUI/ConfigBox.os and /dev/null differ
diff --git a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.os b/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.os
deleted file mode 100644
index 5f2e7d7e28..0000000000
Binary files a/Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.os and /dev/null differ