diff --git a/cli/cppcheck.vcproj b/cli/cppcheck.vcproj
index eb5b71f67..112d6bdcf 100755
--- a/cli/cppcheck.vcproj
+++ b/cli/cppcheck.vcproj
@@ -278,8 +278,6 @@
 				RelativePath="pathmatch.h" />
 			<File
 				RelativePath="..\lib\preprocessor.h" />
-			<File
-				RelativePath="resource.h" />
 			<File
 				RelativePath="..\lib\settings.h" />
 			<File
@@ -302,16 +300,18 @@
 				RelativePath="..\lib\tokenize.h" />
 			<File
 				RelativePath="..\lib\tokenlist.h" />
+			<File
+				RelativePath="..\lib\version.h" />
 		</Filter>
 		<Filter
 			Name="Generated Files"
 			Filter="cpp;c;cxx;moc;h;def;odl;idl;res;"
 			UniqueIdentifier="{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}">
 			<File
-				RelativePath="temp\cppcheck.res" />
+				RelativePath="temp\version.res" />
 		</Filter>
 		<File
-			RelativePath="cppcheck.rc" />
+			RelativePath="version.rc" />
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/test/testrunner.vcproj b/test/testrunner.vcproj
index 8b3959877..d2064cb27 100644
--- a/test/testrunner.vcproj
+++ b/test/testrunner.vcproj
@@ -115,7 +115,7 @@
 				Name="VCPreLinkEventTool" />
 			<Tool
 				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_CONSOLE,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS" />
+				PreprocessorDefinitions="_CONSOLE,UNICODE,WIN32,QT_LARGEFILE_SUPPORT,_CRT_SECURE_NO_WARNINGS,NDEBUG" />
 		</Configuration>
 	</Configurations>
 	<Files>
@@ -223,8 +223,12 @@
 				RelativePath="testfilelister.cpp" />
 			<File
 				RelativePath="testincompletestatement.cpp" />
+			<File
+				RelativePath="testinternal.cpp" />
 			<File
 				RelativePath="testio.cpp" />
+			<File
+				RelativePath="testleakautovar.cpp" />
 			<File
 				RelativePath="testmathlib.cpp" />
 			<File
@@ -261,6 +265,8 @@
 				RelativePath="testsymboldatabase.cpp" />
 			<File
 				RelativePath="testthreadexecutor.cpp" />
+			<File
+				RelativePath="testtimer.cpp" />
 			<File
 				RelativePath="testtoken.cpp" />
 			<File