diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
index 3660b65..11a86a4 100644
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@@ -45,7 +45,7 @@ jobs:
           name: source-distribution
           path: dist/*.tar.gz
     
-  build_windows:
+  build_and_test_windows:
     runs-on: windows-latest
     steps:
       - name: Checkout code
@@ -60,33 +60,17 @@ jobs:
           pip install --upgrade setuptools wheel
       - name: Build the wheel
         run: python setup.py bdist_wheel
-      - name: Upload wheel artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: windows-wheel
-          path: dist/*.whl
-    
-  test_windows:
-    needs: build_windows
-    runs-on: windows-latest
-    steps:
-      - name: Set up Python
-        uses: actions/setup-python@v4
-        with:
-          python-version: "3.8"
-      - name: Checkout code
-        uses: actions/checkout@v3
-      - name: Download wheel artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: windows-wheel
-          path: ./
       - name: Install the wheel
         run: |
-          pip install (get-item traceon-*.whl)
+          pip install (get-item dist/traceon-*.whl)
           pip show traceon
       - name: Run tests
         run: python -m unittest (get-item tests/*.py)
+      - name: Upload wheel artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: windows-wheel
+          path: dist/*.whl
     
   upload_ubuntu:
     needs: build_and_test_ubuntu
@@ -113,7 +97,7 @@ jobs:
         run: python -m twine upload --repository pypi traceon-*.whl
     
   upload_windows:
-    needs: build_windows
+    needs: build_and_test_windows
     runs-on: windows-latest
     if: github.event_name == 'workflow_dispatch'