diff --git a/AUTOTEST/cmake.bat b/AUTOTEST/cmake.bat
index e54149137..30284c938 100755
--- a/AUTOTEST/cmake.bat
+++ b/AUTOTEST/cmake.bat
@@ -37,27 +37,20 @@ mkdir %outdir%
 
 rem clean out 'cmbuild' directories
 cd %srcdir%      && rmdir /s /q cmbuild & mkdir cmbuild
-cd %srcdir%\test && rmdir /s /q cmbuild & mkdir cmbuild
 
 rem run cmake for hypre library and test directory
 cd %srcdir%\cmbuild
-%CMAKE% -G "Visual Studio 15 2017" %cmakeopts% ..               >  %outdir%\lib-cmake.out
-cd %srcdir%\test\cmbuild
-%CMAKE% -G "Visual Studio 15 2017" %cmakeopts% ..               >  %outdir%\test-cmake.out
+%CMAKE% -G "Visual Studio 15 2017" %cmakeopts% "-DHYPRE_BUILD_TESTS=ON" ..               >  %outdir%\lib-cmake.out
 
 rem build release version
 cd %srcdir%\cmbuild
 %MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Release     >  %outdir%\lib-release.out
 %MSBUILD% INSTALL.vcxproj /p:Configuration=Release              >> %outdir%\lib-release.out
-cd %srcdir%\test\cmbuild
-%MSBUILD% ALL_BUILD.vcxproj /t:Rebuild /p:Configuration=Release >  %outdir%\test-release.out
 
 rem build debug version
 cd %srcdir%\cmbuild
 %MSBUILD% HYPRE.vcxproj /t:Rebuild /p:Configuration=Debug       >  %outdir%\lib-debug.out
 %MSBUILD% INSTALL.vcxproj /p:Configuration=Debug                >> %outdir%\lib-debug.out
-cd %srcdir%\test\cmbuild
-%MSBUILD% ALL_BUILD.vcxproj /t:Rebuild /p:Configuration=Release >  %outdir%\test-debug.out
 
 rem create error file - inspect output file lines with "Error(s)" substring
 cd %rundir%
diff --git a/AUTOTEST/cmake.sh b/AUTOTEST/cmake.sh
index 6b209b516..671828ec2 100755
--- a/AUTOTEST/cmake.sh
+++ b/AUTOTEST/cmake.sh
@@ -37,7 +37,7 @@ src_dir=`cd $1; pwd`
 shift
 
 # Parse the rest of the command line
-copts=""
+copts="-DHYPRE_BUILD_TESTS=ON"
 mopts=""
 ropts=""
 eopts=""
@@ -74,7 +74,6 @@ src_dir=`pwd`
 # Clean up the cmbuild directories (do it from src_dir as a precaution)
 cd $src_dir
 rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
-rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
 
 # Clean up the previous install
 cd $src_dir
@@ -86,10 +85,9 @@ cmake $copts ..
 make $mopts install
 
 # Make
-cd $src_dir/test/cmbuild
-cmake ..
+cd $src_dir/cmbuild/test
 make $mopts
-mv -f $drivers ..
+mv -f $drivers ../../test
 
 cd $test_dir
 
@@ -114,7 +112,6 @@ done
 # Clean up
 cd $src_dir
 rm -fr `echo cmbuild/* | sed 's/[^ ]*README.txt//g'`
-rm -fr `echo test/cmbuild/* | sed 's/[^ ]*README.txt//g'`
 rm -fr hypre
 ( cd $src_dir/test; rm -f $drivers; ./cleantest.sh )