diff --git a/cryptest.sh b/cryptest.sh
index 091692f0..cb5db75c 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -346,12 +346,6 @@ else
 	fi
 fi
 
-# Fixup... SunCC appears to botch the code generation
-if [[ ("$SUN_COMPILER" -ne "0" )]];then
-	HAVE_O5=0
-	OPT_O5=
-fi
-
 # Hit or miss, mostly hit
 HAVE_OS=0
 OPT_OS=
@@ -583,6 +577,14 @@ if [[ (-z "$HAVE_DISASS") ]]; then
 	fi
 fi
 
+# Fixup... SunCC appears to generate bad code for BLAKE2s
+if [[ ("$SUN_COMPILER" -ne "0") ]];then
+	HAVE_O5=0
+	OPT_O5=
+	HAVE_OFAST=0
+	OPT_OFAST=
+fi
+
 # Benchmarks take a long time...
 if [[ (-z "$WANT_BENCHMARKS") ]]; then
 	WANT_BENCHMARKS=1