diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index bce5490f94c..c3425186a8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -28,8 +28,7 @@ jobs:
 
           "macos-py36",
 
-          "windows-py37 (1)",
-          "windows-py37 (2)",
+          "windows-py37",
 
           "xdist",
 
@@ -70,20 +69,14 @@ jobs:
             tox_env: "py36-pygments-coverage"
             pytest_addopts: "--verbosity=1"
 
-          - name: "windows-py37 (1)"
+          - name: "windows-py37"
             python: "3.7"
             os: windows-latest
-            tox_env: "py37-coverage-grouped"
+            tox_env: "py37-coverage"
             # Coverage for:
+            # - Windows
             # - verbosity=2
-            pytest_addopts: "--verbosity=2 --test-group-count 2 --test-group=1"
-          - name: "windows-py37 (2)"
-            python: "3.7"
-            os: windows-latest
-            tox_env: "py37-coverage-grouped"
-            # Coverage for:
-            # - verbosity=2
-            pytest_addopts: "--verbosity=2 --test-group-count 2 --test-group=2"
+            pytest_addopts: "--verbosity=2 -m 'windows_specific or acceptance_tests'"
 
           - name: "xdist"
             python: "3.8"
diff --git a/codecov.yml b/codecov.yml
index cfe07a095b5..2f429da8e6f 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,5 +1,5 @@
 comment: false
 codecov:
   notify:
-    after_n_builds: 11
+    after_n_builds: 10
     wait_for_ci: false