diff --git a/.appveyor.yml b/.appveyor.yml
index d7f9928b..a297717e 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -26,7 +26,6 @@ environment:
 
   matrix:
 
-  - BUILD_MODE: CMake
   - BUILD_MODE: MSBuild
 
 # Disable build through solution file
@@ -37,86 +36,15 @@ test_script:
 
 - ps: >-
 
-    if($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2017" -and $env:BUILD_MODE -eq "CMake")
-    {
+    msbuild /t:Build /p:platform="$env:platform" /p:configuration="$env:configuration" cryptlib.vcxproj
 
-        mkdir cmake-build
+    msbuild /t:Build /p:platform="$env:platform" /p:configuration="$env:configuration" cryptest.vcxproj
 
-        cd cmake-build
+    msbuild /t:CopyCryptestToRoot cryptest.vcxproj
 
-        cmake -G "Visual Studio 15 2017" -DCMAKE_BUILD_TYPE=$env:configuration ..\
+    .\cryptest.exe v
 
-        msbuild /t:Build cryptopp-static.vcxproj
-
-        msbuild /t:Build cryptest.vcxproj
-
-        robocopy $env:APPVEYOR_BUILD_FOLDER\cmake-build\$env:configuration\ $env:APPVEYOR_BUILD_FOLDER\ cryptest.exe
-
-        cd $env:APPVEYOR_BUILD_FOLDER\
-
-        .\cryptest.exe v
-
-        .\cryptest.exe tv all
-
-    }
-    elseif($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2015" -and $env:BUILD_MODE -eq "CMake")
-    {
-
-        mkdir cmake-build
-
-        cd cmake-build
-
-        cmake -G "Visual Studio 14 2015" -DCMAKE_BUILD_TYPE=$env:configuration ..\
-
-        msbuild /t:Build cryptopp-static.vcxproj
-
-        msbuild /t:Build cryptest.vcxproj
-
-        robocopy $env:APPVEYOR_BUILD_FOLDER\cmake-build\$env:configuration\ $env:APPVEYOR_BUILD_FOLDER\ cryptest.exe
-
-        cd $env:APPVEYOR_BUILD_FOLDER\
-
-        .\cryptest.exe v
-
-        .\cryptest.exe tv all
-
-    }
-    elseif($env:APPVEYOR_BUILD_WORKER_IMAGE -eq "Visual Studio 2013" -and $env:BUILD_MODE -eq "CMake")
-    {
-
-        mkdir cmake-build
-
-        cd cmake-build
-
-        cmake -G "Visual Studio 12 2013" -DCMAKE_BUILD_TYPE=$env:configuration ..\
-
-        msbuild /t:Build cryptopp-static.vcxproj
-
-        msbuild /t:Build cryptest.vcxproj
-
-        robocopy $env:APPVEYOR_BUILD_FOLDER\cmake-build\$env:configuration\ $env:APPVEYOR_BUILD_FOLDER\ cryptest.exe
-
-        cd $env:APPVEYOR_BUILD_FOLDER\
-
-        .\cryptest.exe v
-
-        .\cryptest.exe tv all
-
-    }
-    else
-    {
-
-        msbuild /t:Build /p:platform="$env:platform" /p:configuration="$env:configuration" cryptlib.vcxproj
-
-        msbuild /t:Build /p:platform="$env:platform" /p:configuration="$env:configuration" cryptest.vcxproj
-
-        msbuild /t:CopyCryptestToRoot cryptest.vcxproj
-
-        .\cryptest.exe v
-
-        .\cryptest.exe tv all
-
-    }
+    .\cryptest.exe tv all
 
 notifications:
   - provider: Email
diff --git a/.travis.yml b/.travis.yml
index 661b9c28..2b0b61a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,6 @@ env:
     - BUILD_MODE="ios-arm64"
     - BUILD_MODE="ios-watch"
     - BUILD_MODE="ios-tv"
-    - BUILD_MODE="cmake"
 
 matrix:
 
@@ -67,33 +66,25 @@ script:
     if [[ "$BUILD_MODE" == "ios-arm" ]]; then
         cp ./TestScripts/setenv-ios.sh .
         . ./setenv-ios.sh arm
-        make -f GNUmakefile-cross
+        make -f GNUmakefile-cross -j "$BUILD_JOBS"
     elif [[ "$BUILD_MODE" == "ios-arm64" ]]; then
         cp ./TestScripts/setenv-ios.sh .
-        . ./setenv-ios.sh arm64
+        . ./setenv-ios.sh arm64 -j "$BUILD_JOBS"
         make -f GNUmakefile-cross
     elif [[ "$BUILD_MODE" == "ios-watch" ]]; then
         cp ./TestScripts/setenv-ios.sh .
         . ./setenv-ios.sh watch
-        make -f GNUmakefile-cross
+        make -f GNUmakefile-cross -j "$BUILD_JOBS"
     elif [[ "$BUILD_MODE" == "ios-tv" ]]; then
         cp ./TestScripts/setenv-ios.sh .
         . ./setenv-ios.sh tv
-        make -f GNUmakefile-cross
+        make -f GNUmakefile-cross -j  "$BUILD_JOBS"
     elif [[ "$BUILD_MODE" == "debug" ]]; then
-        CXXFLAGS="-DDEBUG -g2 -O1" make
-        ./cryptest.exe v
-        ./cryptest.exe tv all
-    elif [[ "$BUILD_MODE" == "cmake" ]]; then
-        CRYPTOPP_DIR=$(pwd)
-        mkdir cryptopp-build
-        cd cryptopp-build
-        cmake $CRYPTOPP_DIR
-        make -j 4 VERBOSE=1
+        CXXFLAGS="-DDEBUG -g2 -O1" make -j "$BUILD_JOBS"
         ./cryptest.exe v
         ./cryptest.exe tv all
     else
-        make "$BUILD_MODE"
+        make "$BUILD_MODE" -j "$BUILD_JOBS"
         ./cryptest.exe v
         ./cryptest.exe tv all
     fi
diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh
index b3664573..74f3ec79 100755
--- a/TestScripts/cryptest.sh
+++ b/TestScripts/cryptest.sh
@@ -4713,73 +4713,6 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then
 	fi
 fi
 
-############################################
-# CMake builds
-CMAKE=$(which cmake 2>&1 | "$GREP" -v "no cmake" | head -1)
-if [[ (! -z "$CMAKE") ]]; then
-	############################################
-	# Debug build
-	echo
-	echo "************************************" | tee -a "$TEST_RESULTS"
-	echo "Testing: Debug, CMake build" | tee -a "$TEST_RESULTS"
-	echo
-
-	"$MAKE" clean > /dev/null 2>&1
-	rm -f adhoc.cpp > /dev/null 2>&1
-
-	mkdir cryptopp-cmake
-	cd cryptopp-cmake
-
-	"$CMAKE" -DCMAKE_BUILD_TYPE=Debug ../
-	"$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
-
-	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-		echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
-	else
-		./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
-		fi
-		./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
-		fi
-	fi
-
-	cd ../
-	rm -rf cryptopp-cmake &> /dev/null
-
-	############################################
-	# Release build
-	echo
-	echo "************************************" | tee -a "$TEST_RESULTS"
-	echo "Testing: Release, CMake build" | tee -a "$TEST_RESULTS"
-	echo
-
-	mkdir cryptopp-cmake
-	cd cryptopp-cmake
-
-	"$CMAKE" -DCMAKE_BUILD_TYPE=Release ../
-	"$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
-
-	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-		echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
-	else
-		./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
-		fi
-		./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
-		fi
-		echo
-	fi
-
-	cd ../
-	rm -rf cryptopp-cmake &> /dev/null
-fi
-
 ############################################
 # Benchmarks
 if [[ "$WANT_BENCHMARKS" -ne "0" ]]; then
diff --git a/cryptest.sh b/cryptest.sh
index b3664573..74f3ec79 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -4713,73 +4713,6 @@ if [[ ("$IS_DARWIN" -ne "0" && "$HAVE_CXX17" -ne "0") ]]; then
 	fi
 fi
 
-############################################
-# CMake builds
-CMAKE=$(which cmake 2>&1 | "$GREP" -v "no cmake" | head -1)
-if [[ (! -z "$CMAKE") ]]; then
-	############################################
-	# Debug build
-	echo
-	echo "************************************" | tee -a "$TEST_RESULTS"
-	echo "Testing: Debug, CMake build" | tee -a "$TEST_RESULTS"
-	echo
-
-	"$MAKE" clean > /dev/null 2>&1
-	rm -f adhoc.cpp > /dev/null 2>&1
-
-	mkdir cryptopp-cmake
-	cd cryptopp-cmake
-
-	"$CMAKE" -DCMAKE_BUILD_TYPE=Debug ../
-	"$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
-
-	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-		echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
-	else
-		./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
-		fi
-		./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
-		fi
-	fi
-
-	cd ../
-	rm -rf cryptopp-cmake &> /dev/null
-
-	############################################
-	# Release build
-	echo
-	echo "************************************" | tee -a "$TEST_RESULTS"
-	echo "Testing: Release, CMake build" | tee -a "$TEST_RESULTS"
-	echo
-
-	mkdir cryptopp-cmake
-	cd cryptopp-cmake
-
-	"$CMAKE" -DCMAKE_BUILD_TYPE=Release ../
-	"$MAKE" "${MAKEARGS[@]}" static dynamic cryptest.exe 2>&1 | tee -a "$TEST_RESULTS"
-
-	if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-		echo "ERROR: failed to make cryptest.exe" | tee -a "$TEST_RESULTS"
-	else
-		./cryptest.exe v 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute validation suite" | tee -a "$TEST_RESULTS"
-		fi
-		./cryptest.exe tv all 2>&1 | tee -a "$TEST_RESULTS"
-		if [[ ("${PIPESTATUS[0]}" -ne "0") ]]; then
-			echo "ERROR: failed to execute test vectors" | tee -a "$TEST_RESULTS"
-		fi
-		echo
-	fi
-
-	cd ../
-	rm -rf cryptopp-cmake &> /dev/null
-fi
-
 ############################################
 # Benchmarks
 if [[ "$WANT_BENCHMARKS" -ne "0" ]]; then