diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
index 0b1c00106..d6092cae4 100644
--- a/.github/workflows/cron.yml
+++ b/.github/workflows/cron.yml
@@ -266,7 +266,7 @@ jobs:
       run: make ensure
     - name: Running ${{ matrix.clouds }}${{ matrix.languages }} Tests
       run: make specific_test_set TestSet=${{ matrix.clouds }}${{ matrix.languages
-        }} Parallelism=${{ matrix.parallelism }}
+        }}
     strategy:
       fail-fast: false
       matrix:
@@ -297,16 +297,6 @@ jobs:
         - ubuntu-latest
         python-version:
         - "3.7"
-        parallelism:
-        - 40
-        exclude:
-          - clouds: Aws
-            languages: Py
-            parallelism: 40
-        include:
-          - clouds: Aws
-            languages: Py
-            parallelism: 20
   providers-output-values:
     name: providers-output-values
     env:
@@ -390,7 +380,7 @@ jobs:
       run: make ensure
     - name: Running ${{ matrix.clouds }}${{ matrix.languages }} Tests
       run: make specific_test_set TestSet=${{ matrix.clouds }}${{ matrix.languages
-        }} Parallelism=${{ matrix.parallelism }}
+        }}
     strategy:
       fail-fast: false
       matrix:
@@ -421,16 +411,6 @@ jobs:
         - ubuntu-latest
         python-version:
         - "3.7"
-        parallelism:
-        - 40
-        exclude:
-          - clouds: Aws
-            languages: Py
-            parallelism: 40
-        include:
-          - clouds: Aws
-            languages: Py
-            parallelism: 20
   python-unit-testing:
     name: Running ${{ matrix.source-dir }} test
     runs-on: ${{ matrix.platform }}
diff --git a/Makefile b/Makefile
index 18f03272b..45f2c9438 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,9 @@ specific_test_set:
 	echo "running $(TestSet) Acceptance Tests"
 	cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel 40 --tags=all --run=TestAcc$(TestSet)
 
-Parallelism ?= 40
-
 specific_tag_set:
 	echo "running $(TagSet)$(TestSet) Acceptance Tests"
-	cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel $(Parallelism) --tags=$(TagSet) --run=TestAcc$(TagSet)$(TestSet)
+	cd misc/test && go test . --timeout 4h -v -count=1 -short -parallel 40 --tags=$(TagSet) --run=TestAcc$(TagSet)$(TestSet)
 
 performance_test_set:
 	cd misc/test && go test . --timeout 4h -count=1 -short -parallel 40 --tags=Performance