diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 16119c10f..1e04cb32b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -131,6 +131,23 @@ jobs:
           cd server/
           chmod +x ./shell/g1.sh
           ./shell/g1.sh
+      - name: Run G2 tests
+        run: |
+          cd server/
+          chmod +x ./shell/g2.sh
+          ./shell/g2.sh
+
+      - name: Run G3 tests
+        run: |
+          cd server/
+          chmod +x ./shell/g3.sh
+          ./shell/g3.sh
+          
+      - name: Run G4 tests
+        run: |
+          cd server/
+          chmod +x ./shell/g4.sh
+          ./shell/g4.sh
 
       - name: Message
         run:
diff --git a/server/shell/g3.sh b/server/shell/g3.sh
index 7b6a2f1d3..8fb17499d 100755
--- a/server/shell/g3.sh
+++ b/server/shell/g3.sh
@@ -3,7 +3,11 @@
 # Source shared configuration
 source "$(dirname "$0")/config.sh"
 
-MOCHA_PARALLEL=true $MOCHA_SETUP
+# MOCHA_PARALLEL=true $MOCHA_SETUP
+
+if [[ "$1" == *"setup"* ]]; then
+  MOCHA_PARALLEL=true $MOCHA_SETUP
+fi
 
 $MOCHA_CMD 'tests/contUse/entities/*.ts'
 
diff --git a/server/shell/g4.sh b/server/shell/g4.sh
index 3a89df507..b5a362206 100755
--- a/server/shell/g4.sh
+++ b/server/shell/g4.sh
@@ -3,7 +3,10 @@
 # Source shared configuration
 source "$(dirname "$0")/config.sh"
 
-MOCHA_PARALLEL=true $MOCHA_SETUP 
+# MOCHA_PARALLEL=true $MOCHA_SETUP 
+if [[ "$1" == *"setup"* ]]; then
+  MOCHA_PARALLEL=true $MOCHA_SETUP
+fi
 
 $MOCHA_CMD 'tests/advanced/multiFeature/*.ts' \
            'tests/advanced/coupons/*.ts' \