diff --git a/build/tools/appveyor-test.bat b/build/tools/appveyor-test.bat
index d9eb84dad4..18b9b9da22 100755
--- a/build/tools/appveyor-test.bat
+++ b/build/tools/appveyor-test.bat
@@ -15,9 +15,10 @@ goto :eof
 
 :nmake
 if "%BUILD%"=="debug" set debug_suffix=d
-.\vc_mswu%debug_suffix%\test.exe
+if "%ARCH%"=="amd64" set arch_suffix=_x64
+.\vc_mswu%debug_suffix%%arch_suffix%\test.exe
 if %errorlevel% NEQ 0 goto :error
-.\vc_mswu%debug_suffix%\test_gui.exe
+.\vc_mswu%debug_suffix%%arch_suffix%\test_gui.exe
 goto :eof
 
 :mingw
diff --git a/build/tools/appveyor.bat b/build/tools/appveyor.bat
index 35fb5a5ccf..3867eac673 100644
--- a/build/tools/appveyor.bat
+++ b/build/tools/appveyor.bat
@@ -7,14 +7,20 @@ msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" wx_vc12.
 cd ..\..\tests
 msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_vc12.sln %MSBUILD_LOGGER%
 msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" test_gui_vc12.sln %MSBUILD_LOGGER%
+cd  ..\samples\minimal
+msbuild /m:2 /v:n /p:Platform=%ARCH% /p:Configuration="%CONFIGURATION%" minimal_vc12.sln %MSBUILD_LOGGER%
 goto :eof
 
 :nmake
 cd build\msw
 call "C:\Program Files (x86)\Microsoft Visual Studio %VS%\VC\vcvarsall.bat" %ARCH%
-nmake -f makefile.vc BUILD=%BUILD%
+if "%ARCH%"=="amd64" set CPUARG=CPU=%X64
+if "%VS%"=="9.0" set DPIARG=USE_DPI_AWARE_MANIFEST=0
+nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
 cd ..\..\tests
-nmake -f makefile.vc BUILD=%BUILD%
+nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
+cd  ..\samples\minimal
+nmake -f makefile.vc BUILD=%BUILD% %CPUARG% %DPIARG%
 goto :eof
 
 :mingw