diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d45d0543..0514ea38 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,19 +4,19 @@ on:
   push:
 
 jobs:
-  test-lin:
+  test:
     strategy:
       matrix:
-        os: ['ubuntu']
+        os: ['ubuntu', 'windows']
         pyver: ['3.8', '3.9', '3.10', '3.11', '3.12']
     runs-on: ${{ matrix.os }}-latest
     name: ${{ matrix.os }} | ${{ matrix.pyver }}
+    exclude:
+      os: ['windows']
+      pyver: ['3.8', '3.9', '3.10', '3.11']
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
-      with:
-        submodules: true
-        fetch-depth: 0
     - name: Set up Python ${{ matrix.pyver }}
       uses: actions/setup-python@v5
       with:
@@ -25,22 +25,30 @@ jobs:
       run: pip install . && pip install pytest
     - name: Run tests
       run: |
-        source tests/mocks/source-me.sh && make test
-        cd examples/projects && bash regress.sh
-  test-win:
-    runs-on: windows-latest
-    name: windows | 3.12
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-        fetch-depth: 0
-    - name: Set up Python 3.12
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.12
-    - name: Install dependencies
-      run: pip install . && pip install pytest
-    - name: Run tests
-      run: make test
+        make test
+
+#        source tests/mocks/source-me.sh && make test
+#        cd examples/projects && bash regress.sh
+#  test-win:
+#    strategy:
+#      matrix:
+#        os: ['windows']
+#        pyver: ['3.12']
+#    runs-on: ${{ matrix.os }}-latest
+#    name: ${{ matrix.os }} | ${{ matrix.pyver }}
+#    steps:
+#    - name: Checkout repository
+#      uses: actions/checkout@v4
+#    - name: Set up Python ${{ matrix.pyver }}
+#      uses: actions/setup-python@v5
+#      with:
+#        python-version: ${{ matrix.pyver }}
+#    - name: Install dependencies
+#      run: pip install . && pip install pytest
+#    - name: Run tests
+#      run: |
+#        source tests/mocks/source-me.sh && make test
+#        cd examples/projects && bash regress.sh
+
+#        $Env:PATH += ";${{ github.workspace }}\tests\mocks"
+#        cd examples\projects && python3 vivado.py
diff --git a/tests/test_tools.py b/tests/test_tools.py
index ad28632a..98f00055 100644
--- a/tests/test_tools.py
+++ b/tests/test_tools.py
@@ -85,9 +85,9 @@ def generate(tool, part):
     prj.add_hook('postbit', 'HOOK16')
     try:
         prj.make()
-    except Exception:
+    except RuntimeError:
         pass
     try:
         prj.prog()
-    except Exception:
+    except RuntimeError:
         pass