diff --git a/Makefile b/Makefile
index 32b53637..ce2f58d6 100644
--- a/Makefile
+++ b/Makefile
@@ -30,17 +30,19 @@ DOCKERFILE              ?= Dockerfile
 
 STATICCHECK_IGNORE =
 
-ifeq ($(GOHOSTARCH),amd64)
-	# Only supported on amd64
-	test-flags := -race
-endif
-
 ifeq ($(OS),Windows_NT)
     OS_detected := Windows
 else
     OS_detected := $(shell uname -s)
 endif
 
+ifeq ($(GOHOSTARCH),amd64)
+        ifneq ($(OS_detected),SunOS)
+                # Only supported on amd64
+                test-flags := -race
+        endif
+endif
+
 ifeq ($(OS_detected), Linux)
     test-e2e := test-e2e
 else