diff --git a/cryptest.sh b/cryptest.sh
index 31a1b19c..af541f8f 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -1690,7 +1690,7 @@ fi
 # This check was added after testing on Ubuntu 14.04 with Clang 3.4.
 if [ "$CXX" == "g++" ]; then
 
-	CLANG_COMPILER=$(which clang++)
+	CLANG_COMPILER=$(which clang++ 2>/dev/null)
 	"$CLANG_COMPILER" -x c++ -DCRYPTOPP_ADHOC_MAIN adhoc.cpp.proto -o $TMP/adhoc > /dev/null 2>&1
 	if [ "$?" -eq "0" ]; then
 
@@ -1828,6 +1828,12 @@ if [ "$IS_CYGWIN" -eq "0" ] && [ "$IS_MINGW" -eq "0" ]; then
 	fi
 fi
 
+############################################
+# Cleanup
+unset CXXFLAGS
+"$MAKE" clean > /dev/null 2>&1
+rm -f adhoc.cpp > /dev/null 2>&1
+
 ############################################
 ############################################