diff --git a/Source/TestSuite/ASM/source/dolphintest_asm.cpp b/Source/TestSuite/ASM/source/dolphintest_asm.cpp
index 13c6af49f3..da3afdf73e 100644
--- a/Source/TestSuite/ASM/source/dolphintest_asm.cpp
+++ b/Source/TestSuite/ASM/source/dolphintest_asm.cpp
@@ -26,11 +26,13 @@
 #include "Helpers.h"
 
 FILE *f = NULL;
-int main(int argc, char **argv) {
+
+int main(int argc, char **argv)
+{
 	init_crap();
 	initialise_fat();
 	
-	for(int a = 0; a < sizeof(instructions) / sizeof(inst); ++a)
+	for (uint a = 0; a < sizeof(instructions) / sizeof(inst); ++a)
 	{
 		RunInstruction(a);
 	}
diff --git a/Source/TestSuite/ASM/source/makefile b/Source/TestSuite/ASM/source/makefile
deleted file mode 100644
index 240eb6d1e8..0000000000
--- a/Source/TestSuite/ASM/source/makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-	g++ -g -arch ppc dolphintest_asm.cpp asm_tables.cpp Helpers.cpp asm_integer.cpp asm_float.cpp -o Test
diff --git a/Source/TestSuite/TestSuite.sln b/Source/TestSuite/TestSuite.sln
index 71749bec5e..bed10de5de 100644
--- a/Source/TestSuite/TestSuite.sln
+++ b/Source/TestSuite/TestSuite.sln
@@ -28,6 +28,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FPU", "FPU\FPU.vcproj", "{18373B64-BCAB-4677-A070-7AD45D4C8304}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASM", "ASM\ASM.vcproj", "{B0723635-279A-44E0-80A6-FC21DBB7A4B4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -78,6 +80,10 @@ Global
 		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Debug|Win32.Build.0 = Debug|Win32
 		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Release|Win32.ActiveCfg = Release|Win32
 		{18373B64-BCAB-4677-A070-7AD45D4C8304}.Release|Win32.Build.0 = Release|Win32
+		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Debug|Win32.ActiveCfg = Release|Win32
+		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Debug|Win32.Build.0 = Release|Win32
+		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Release|Win32.ActiveCfg = Release|Win32
+		{B0723635-279A-44E0-80A6-FC21DBB7A4B4}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE