diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index fa74e10f..94fb08ad 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -69,7 +69,7 @@ jobs:
 
       - name: Test
         continue-on-error: ${{contains(matrix.go_version, 'beta') || contains(matrix.go_version, 'rc')}}
-        run: go test -race -cover ./... -v
+        run: go test -shuffle=on -race -cover ./... -v
 
   js:
     name: Build JS bundle
diff --git a/Makefile b/Makefile
index 658e02d9..a868da14 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ watch: ##@Development Start Go tests in watch mode (re-run when code changes)
 .PHONY: watch
 
 test: ##@Development Run Go tests
-	go test -race ./...
+	go test -race -shuffle=on ./...
 .PHONY: test
 
 testall: test ##@Development Run Go and JS tests