diff --git a/.travis.yml b/.travis.yml
index b88ea873..d7fbb063 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -51,93 +51,120 @@ matrix:
   include:
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=autotools
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=cmake
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=autotools
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=cmake
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=armeabi-v7a
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=armv7a-neon
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=aarch64
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=mipsel
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=mipsel64
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=x86
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=x86_64
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=iPhoneOS
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=Arm64
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=WatchOS
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=AppleTVOS
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=iPhoneSimulator
 
   allow_failures:
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=WatchOS
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=armeabi
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=mipsel
     - os: linux
       env:
+        - BUILD_OS=linux
         - BUILD_MODE=android
         - PLATFORM=mipsel64
     - os: osx
       env:
+        - BUILD_OS=osx
         - BUILD_MODE=ios
         - PLATFORM=iPhoneSimulator
 
 before_install:
   - |
-    if [[ "$BUILD_MODE" == "android" ]]; then
+    if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "android" ]]; then
         # https://github.com/travis-ci/travis-ci/issues/9037
         sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
-        TestScripts/install-android.sh
+        sudo apt-get update
+        bash TestScripts/install-android.sh
+    fi
+    if [[ "$BUILD_OS" == "linux" ]] && [[ "$BUILD_MODE" == "autotools" ]]; then
+        # https://github.com/travis-ci/travis-ci/issues/9037
+        sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A145
+        sudo apt-get install -y autoconf automake libtool
     fi
 
 # xattr is OS X only and is used to remove quarantine bits
@@ -146,27 +173,27 @@ before_install:
 script:
   - |
     if [[ "$BUILD_MODE" == "ios" ]]; then
-        cp ./TestScripts/setenv-ios.sh .
-        cp ./TestScripts/cryptest-ios.sh .
+        cp TestScripts/setenv-ios.sh "${PWD}"
+        cp TestScripts/cryptest-ios.sh "${PWD}"
         chmod +x *.sh
-        xattr -r -d com.apple.quarantine *.sh 2>/dev/null
-        ./cryptest-ios.sh
+        xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
+        bash cryptest-ios.sh
     elif [[ "$BUILD_MODE" == "android" ]]; then
-        cp ./TestScripts/setenv-android-gcc.sh .
-        cp ./TestScripts/cryptest-android.sh .
+        cp TestScripts/setenv-android-gcc.sh "${PWD}"
+        cp TestScripts/cryptest-android.sh "${PWD}"
         chmod +x *.sh
-        xattr -r -d com.apple.quarantine *.sh 2>/dev/null
-        ./cryptest-android.sh
+        xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
+        bash cryptest-android.sh
     elif [[ "$BUILD_MODE" == "autotools" ]]; then
-        cp ./TestScripts/cryptest-autotools.sh .
+        cp TestScripts/cryptest-autotools.sh "${PWD}"
         chmod +x *.sh
-        xattr -r -d com.apple.quarantine *.sh 2>/dev/null
-        ./cryptest-autotools.sh
+        xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
+        bash cryptest-autotools.sh
     elif [[ "$BUILD_MODE" == "cmake" ]]; then
-        cp ./TestScripts/cryptest-cmake.sh .
+        cp TestScripts/cryptest-cmake.sh "${PWD}"
         chmod +x *.sh
-        xattr -r -d com.apple.quarantine *.sh 2>/dev/null
-        ./cryptest-cmake.sh
+        xattr -r -d com.apple.quarantine "${PWD}" 2>/dev/null
+        bash cryptest-cmake.sh
     elif [[ "$BUILD_MODE" == "debug" ]]; then
         CXXFLAGS="-DDEBUG -g2 -O1" make -j "$BUILD_JOBS"
         ./cryptest.exe v
diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 8dc2026c..bce7f05b 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -451,7 +451,7 @@ distclean: clean autotools-clean cmake-clean
 	-$(RM) adhoc.cpp adhoc.cpp.copied GNUmakefile.deps benchmarks.html cryptest.txt
 	@-$(RM) cryptest-*.txt cryptopp.tgz libcryptopp.pc *.o *.bc *.ii *~
 	@-$(RM) -r cryptlib.lib cryptest.exe *.suo *.sdf *.pdb Win32/ x64/ ipch/
-	@-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj) $(DOCUMENT_DIRECTORY)/
+	@-$(RM) -r $(LIBOBJS:.o=.obj) $(TESTOBJS:.o=.obj)
 	@-$(RM) -r TestCoverage/
 	@-$(RM) cryptopp$(LIB_VER)\.* CryptoPPRef.zip