diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 431d2828595..9cd1cbcdefe 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -8,15 +8,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.6", "3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10"]
         architecture: ["x86", "x64"]
         include:
-          # PyPy3.6 only ships 32-bit binaries for Windows
-          - python-version: "pypy-3.6"
-            architecture: "x86"
           # PyPy 7.3.4+ only ships 64-bit binaries for Windows
           - python-version: "pypy-3.7"
             architecture: "x64"
+          - python-version: "pypy-3.8"
+            architecture: "x64"
 
     timeout-minutes: 30
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 53ecbb32b3f..43ca263a6d6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,23 +9,22 @@ jobs:
       fail-fast: false
       matrix:
         os: [
-          "ubuntu-latest",
           "macOS-latest",
+          "ubuntu-latest",
         ]
         python-version: [
+          "pypy-3.8",
           "pypy-3.7",
-          "pypy-3.6",
           "3.10",
           "3.9",
           "3.8",
           "3.7",
-          "3.6",
         ]
         include:
-        - python-version: "3.6"
+        - python-version: "3.7"
           PYTHONOPTIMIZE: 1
           REVERSE: "--reverse"
-        - python-version: "3.7"
+        - python-version: "3.8"
           PYTHONOPTIMIZE: 2
         # Include new variables for Codecov
         - os: ubuntu-latest