diff --git a/.github/workflows/test-all-386.yaml b/.github/workflows/test-all-386.yaml
index f839be0b3..c20513006 100644
--- a/.github/workflows/test-all-386.yaml
+++ b/.github/workflows/test-all-386.yaml
@@ -57,4 +57,4 @@ jobs:
 
       - name: "Run All Tests"
         run: |
-          GOARCH=386 make test TEST_FLAGS="-v -count 1 -timeout 30m"
+          GOARCH=386 make test-dmt TEST_FLAGS="-v -count 1 -timeout 30m"
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 1ecb75df5..d66fd8428 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -70,4 +70,4 @@ jobs:
 
       - name: "Run All Tests"
         run: |
-          make test
+          make test-dmt
diff --git a/Makefile b/Makefile
index 0ace23886..71aaa40ee 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,9 @@ build-dmt:
 	CGO_ENABLED=0 go build -tags base,migration,config,home,version,hazelcastinternal,hazelcastinternaltest -ldflags "$(LDFLAGS)"  -o build/$(BINARY_NAME) ./cmd/clc
 
 test:
+	go test -tags base,std,hazelcastinternal,hazelcastinternaltest -p 1 $(TEST_FLAGS) ./...
+
+test-dmt:
 	go test -tags base,std,migration,config,home,version,hazelcastinternal,hazelcastinternaltest -p 1 $(TEST_FLAGS) ./...
 
 test-cover: