diff --git a/.github/workflows/test-node.yml b/.github/workflows/test-node.yml
index dfca31a50d..24f47cef8a 100644
--- a/.github/workflows/test-node.yml
+++ b/.github/workflows/test-node.yml
@@ -30,16 +30,19 @@ jobs:
           python-version: ${{ matrix.python }}
         env:
           PYTHON_VERSION: ${{ matrix.python }}
-      - name: Add msbuild to PATH
-        if: matrix.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v1.0.0
       - name: Install Dependencies
         run: |
-          npm install
-      - name: Lint JavaScript
+          npm install --no-progress
+      - name: Lint with standard
         if: matrix.os == 'ubuntu-latest'
         run: |
           npm run lint
-      - name: Run JavaScript Tests
+      - name: Test with tap (Linux and macOS)
+        if: matrix.os != 'windows-latest'
         run: |
           npm test
+      - name: Test with tap (Windows)
+        if: matrix.os == 'windows-latest'
+        shell: bash
+        run: |
+          GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" npm test
diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml
index 3fcb3f6e38..8d25144f80 100644
--- a/.github/workflows/test-python.yml
+++ b/.github/workflows/test-python.yml
@@ -1,5 +1,5 @@
-# TODO: Line 15, enable python-version: 3.5
-# TODO: Line 36, enable pytest --doctest-modules
+# TODO: Line 21, enable python-version: 3.5
+# TODO: Line 50, enable pytest --doctest-modules
 
 name: Python Tests
 
@@ -18,17 +18,14 @@ jobs:
       fail-fast: false
       max-parallel: 15
       matrix:
+        python-version: [3.6, 3.7, 3.8]
         os: [macos-latest, ubuntu-latest, windows-latest]
-        python-version: [3.6, 3.7, 3.8] 
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-      - name: Add msbuild to PATH
-        if: matrix.os == 'windows-latest'
-        uses: microsoft/setup-msbuild@v1.0.0
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -40,9 +37,15 @@ jobs:
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
           # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
           flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-      - name: Test with pytest
+      - name: Test with pytest (Linux and macOS)
+        if: matrix.os != 'windows-latest'
         shell: bash
         run: |
           python -m pytest
+      - name: Test with pytest (Windows)
+        if: matrix.os == 'windows-latest'
+        shell: bash
+        run: |
+          GYP_MSVS_VERSION=2015 GYP_MSVS_OVERRIDE_PATH="C:\\Dummy" python -m pytest
       # - name: Run doctests with pytest
       #   run: pytest --doctest-modules