diff --git a/contrib/buildserver/cmake_daily.sh b/contrib/buildserver/cmake_daily.sh
index df76e277..16a41a88 100755
--- a/contrib/buildserver/cmake_daily.sh
+++ b/contrib/buildserver/cmake_daily.sh
@@ -88,12 +88,12 @@ testBuild()
             (
                 PATH="$msvc:/cygdrive/c/Windows/System32:/cygdrive/c/Program Files/csvn/bin:/cygdrive/c/Program Files (x86)/WANdisco/Subversion/csvn/bin:/cygdrive/c/Program Files/7-zip:/cygdrive/c/Program Files (x86)/cmake/bin"
                 # cmd.exe /c "cd $build && vcvars $vs $arch && cmakeBuild --rebuild --exiv2=$exiv2 $*"
-                #for ARCH in x64 Win32; do
-                #    for VS in 2005 2008 2010 2012 2013 2015; do
-                #        cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2 --test $*"
-                #    done
-                #done
-                cmd.exe /c "cd $build && cmakeBuildAll --rebuild --exiv2=$exiv2 $*"
+                for ARCH in 64 32; do
+                    for VS in 2005 2008 2010 2012 2013 2015; do
+                        cmd.exe /c "cd $build && vcvars $VS $ARCH && cmakeBuild --rebuild --exiv2=$exiv2$*"
+                    done
+                done
+                # cmd.exe /c "cd $build && cmakeBuildAll --rebuild --exiv2=$exiv2 $*"
                 result=$?
                 cp     $msvc/vcvars.bat $build/dist # required by test_daily.sh
             )