diff --git a/cppcheck.sln b/cppcheck.sln
index 61013a97d..3b5ac7bf7 100644
--- a/cppcheck.sln
+++ b/cppcheck.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual C++ Express 2008
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcproj", "{230A4467-25A6-3276-A1D0-CB521812CD43}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcproj", "{5B7869EA-A1CB-3E73-8569-5B385608779E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner", "test\testrunner.vcproj", "{A1772A4C-E3F0-33FC-9A59-2189857FB799}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,14 +20,14 @@ Global
 		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release|Win32.Build.0 = Release|Win32
 		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
 		{230A4467-25A6-3276-A1D0-CB521812CD43}.Release-x64|Win32.Build.0 = Release-x64|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug|Win32.Build.0 = Debug|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release|Win32.ActiveCfg = Release|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release|Win32.Build.0 = Release|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
-		{5B7869EA-A1CB-3E73-8569-5B385608779E}.Release-x64|Win32.Build.0 = Release-x64|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Debug|Win32.Build.0 = Debug|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Debug-x64|Win32.ActiveCfg = Debug-x64|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Debug-x64|Win32.Build.0 = Debug-x64|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Release|Win32.ActiveCfg = Release|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Release|Win32.Build.0 = Release|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Release-x64|Win32.ActiveCfg = Release-x64|Win32
+		{A1772A4C-E3F0-33FC-9A59-2189857FB799}.Release-x64|Win32.Build.0 = Release-x64|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/cppcheck_vs2010.sln b/cppcheck_vs2010.sln
index cc1f27116..a117376c1 100644
--- a/cppcheck_vs2010.sln
+++ b/cppcheck_vs2010.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcxproj", "{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cppcheck", "cli\cppcheck.vcxproj", "{35CBDF51-2456-3EC3-99ED-113C30858883}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test.vcxproj", "{BA98E531-D8B3-39CB-8171-064854404B81}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testrunner", "test\testrunner.vcxproj", "{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -12,22 +12,20 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|Win32.Build.0 = Debug|Win32
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|x64.ActiveCfg = Debug|x64
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Debug|x64.Build.0 = Debug|x64
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.ActiveCfg = Release|Win32
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|Win32.Build.0 = Release|Win32
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|x64.ActiveCfg = Release|x64
-		{7D0D241B-E144-3FAC-ABD3-8D1BBA4B600A}.Release|x64.Build.0 = Release|x64
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|Win32.Build.0 = Debug|Win32
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|x64.ActiveCfg = Debug|x64
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Debug|x64.Build.0 = Debug|x64
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.ActiveCfg = Release|Win32
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|Win32.Build.0 = Release|Win32
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|x64.ActiveCfg = Release|x64
-		{BA98E531-D8B3-39CB-8171-064854404B81}.Release|x64.Build.0 = Release|x64
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.ActiveCfg = Debug|Win32
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|Win32.Build.0 = Debug|Win32
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.ActiveCfg = Debug|x64
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Debug|x64.Build.0 = Debug|x64
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.ActiveCfg = Release|Win32
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|Win32.Build.0 = Release|Win32
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.ActiveCfg = Release|x64
+		{35CBDF51-2456-3EC3-99ED-113C30858883}.Release|x64.Build.0 = Release|x64
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|Win32.Build.0 = Debug|Win32
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Debug|x64.ActiveCfg = Debug|Win32
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.ActiveCfg = Release|Win32
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|Win32.Build.0 = Release|Win32
+		{4F7DCE5E-6CDE-38C4-9EA7-27AF3B25CEB4}.Release|x64.ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE