diff --git a/scripts/generate-coverage.sh b/scripts/generate-coverage.sh
index feeaeb418..c7be09071 100755
--- a/scripts/generate-coverage.sh
+++ b/scripts/generate-coverage.sh
@@ -4,12 +4,22 @@
 # go test can't generate code coverage for multiple packages in one command
 
 set -e
+ARCH=$(uname -m)
 echo "" > coverage.txt
-go test -i -race ./cmd/odo
+# The race detector is currently not supported on s390x .
+if [ "${ARCH}" == "s390x" ]; then
+    go test -i ./cmd/odo
+else
+    go test -i -race ./cmd/odo
+fi
+
 for d in $(go list ./... | grep -v vendor | grep -v tests); do
     # For watch related tests, race check causes issue so disabling them here as race is already tested in other tests when used with `-coverprofile=profile.out`
     if [ "$d" = "github.com/openshift/odo/pkg/component" ]; then
         go test -coverprofile=profile.out -covermode=atomic $d
+    elif [ "${ARCH}" == "s390x" ]; then
+        # The race detector is currently not supported on s390x .
+        go test -coverprofile=profile.out -covermode=atomic $d
     else
         go test -race -coverprofile=profile.out -covermode=atomic $d
     fi
@@ -17,4 +27,4 @@ for d in $(go list ./... | grep -v vendor | grep -v tests); do
         cat profile.out >> coverage.txt
         rm profile.out
     fi
-done
\ No newline at end of file
+done