diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ab908f42..6cfc0fbc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,11 +44,13 @@ jobs:
             jid: 5
             goal: "build"
             gamos: "windows"
+            python: ${{ env.BUILD_PYTHON_VERSION }}
           - os: windows-2019
             jid: 6
             goal: "build"
             gamos: "windows"
             PLATFORM: "x86"
+            python: ${{ env.BUILD_PYTHON_VERSION }}
           - os: ubuntu-20.04
             goal: "test"
             python: "3.6"
@@ -92,8 +94,8 @@ jobs:
           echo "GOAL=${GOAL}" >> $GITHUB_ENV
           echo "JID=${JID}" >> $GITHUB_ENV
 
-      - name: Use pre-compiled Python for testing old versions
-        if: matrix.goal == 'test'
+      - name: Use pre-compiled Python for testing and Windows
+        if: matrix.python != ''
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
diff --git a/src/travis/windows-before-install.sh b/src/travis/windows-before-install.sh
index 02fee3e5..5157636e 100755
--- a/src/travis/windows-before-install.sh
+++ b/src/travis/windows-before-install.sh
@@ -15,13 +15,8 @@ echo "This is a ${BITS}-bit build for ${PLATFORM}"
 export mypath=$(pwd)
 cd ~
 
-choco install python --limit-output $CHOCOPTIONS
-until [ -f "/c/Python39/bin/python3.exe" ]; do
-  sleep 5
-  ls -l /c/Python39/
-done
-export python="/c/Python39/bin/python3"
-export pip="/c/Python39/bin/pip3"
+export python="python3"
+export pip="pip3"
 
 # Python
 #echo "Installing Python..."