diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index 075707bf6bd..08d1573d748 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.5", "3.6", "3.7"]
+        python-version: ["3.5", "3.6", "3.7", "3.8", "pypy3.6"]
         architecture: ["x86", "x64"]
         include:
           - architecture: "x86"
@@ -324,6 +324,7 @@ jobs:
         set LIB=%INCLIB%;%PYTHON%\tcl
         set INCLUDE=%INCLIB%;%GITHUB_WORKSPACE%\depends\tcl86\include;%INCLUDE%
         call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.platform-vcvars }}
+        set MSSdk=1
         set DISTUTILS_USE_SDK=1
         set py_vcruntime_redist=true
         %PYTHON%\python.exe setup.py build_ext install
diff --git a/winbuild/config.py b/winbuild/config.py
index 826c6183c59..7f7fc74309b 100644
--- a/winbuild/config.py
+++ b/winbuild/config.py
@@ -3,16 +3,17 @@
 SF_MIRROR = "https://iweb.dl.sourceforge.net"
 
 pythons = {
+    "pypy3": {"compiler": 7.1, "vc": 2015},
     # for AppVeyor
     "35": {"compiler": 7.1, "vc": 2015},
     "36": {"compiler": 7.1, "vc": 2015},
-    "pypy3": {"compiler": 7.1, "vc": 2015},
     "37": {"compiler": 7.1, "vc": 2015},
     "38": {"compiler": 7.1, "vc": 2015},
     # for GitHub Actions
     "3.5": {"compiler": 7.1, "vc": 2015},
     "3.6": {"compiler": 7.1, "vc": 2015},
     "3.7": {"compiler": 7.1, "vc": 2015},
+    "3.8": {"compiler": 7.1, "vc": 2015},
 }
 
 VIRT_BASE = "c:/vp/"