diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh
index 672bb76d..36038edd 100755
--- a/TestScripts/cryptest.sh
+++ b/TestScripts/cryptest.sh
@@ -2767,7 +2767,7 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then
 	echo "Testing: Release, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
-	TEST_LIST+=("Debug, c++14")
+	TEST_LIST+=("Release, c++14")
 
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
@@ -2828,7 +2828,7 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then
 	echo "Testing: Release, gnu++14" | tee -a "$TEST_RESULTS"
 	echo
 
-	TEST_LIST+=("Debug, gnu++14")
+	TEST_LIST+=("Release, gnu++14")
 
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
diff --git a/cpu.cpp b/cpu.cpp
index 5a7b5ca6..1d023297 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -48,6 +48,11 @@ unsigned long int getauxval(unsigned long int) { return 0; }
 # include <setjmp.h>
 #endif
 
+// Needed by SunCC and MSVC
+#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
+# include <emmintrin.h>
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 #ifndef CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY
diff --git a/cryptest.sh b/cryptest.sh
index 672bb76d..36038edd 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -2767,7 +2767,7 @@ if [[ "$HAVE_CXX14" -ne "0" ]]; then
 	echo "Testing: Release, c++14" | tee -a "$TEST_RESULTS"
 	echo
 
-	TEST_LIST+=("Debug, c++14")
+	TEST_LIST+=("Release, c++14")
 
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1
@@ -2828,7 +2828,7 @@ if [[ "$HAVE_GNU14" -ne "0" ]]; then
 	echo "Testing: Release, gnu++14" | tee -a "$TEST_RESULTS"
 	echo
 
-	TEST_LIST+=("Debug, gnu++14")
+	TEST_LIST+=("Release, gnu++14")
 
 	"$MAKE" clean > /dev/null 2>&1
 	rm -f adhoc.cpp > /dev/null 2>&1