diff --git a/TestScripts/cryptest.sh b/TestScripts/cryptest.sh
index 4801641e..ec3f412b 100755
--- a/TestScripts/cryptest.sh
+++ b/TestScripts/cryptest.sh
@@ -1752,7 +1752,7 @@ if [[ ("$IS_FEDORA" -ne "0") ]]; then
 	# https://kojipkgs.fedoraproject.org//packages/cryptopp/5.6.3/8.fc27/data/logs/x86_64/build.log
 	if [[ ("$IS_X86" -ne "0") ]]; then
 		MARCH_OPT=(-m32 -march=i686)
-	else
+	if [[ ("$IS_X64" -ne "0") ]]; then
 		MARCH_OPT=(-m64 -mtune=generic)
 	fi
 
diff --git a/cryptest.sh b/cryptest.sh
index 4801641e..ec3f412b 100755
--- a/cryptest.sh
+++ b/cryptest.sh
@@ -1752,7 +1752,7 @@ if [[ ("$IS_FEDORA" -ne "0") ]]; then
 	# https://kojipkgs.fedoraproject.org//packages/cryptopp/5.6.3/8.fc27/data/logs/x86_64/build.log
 	if [[ ("$IS_X86" -ne "0") ]]; then
 		MARCH_OPT=(-m32 -march=i686)
-	else
+	if [[ ("$IS_X64" -ne "0") ]]; then
 		MARCH_OPT=(-m64 -mtune=generic)
 	fi