diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b7a0121..9069814 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,8 +10,8 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9, '3.10']
-        os: ["macOS-latest", "ubuntu-latest", "windows-latest"]
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: ["macOS-latest", "ubuntu-latest"]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python ${{ matrix.python-version }}
@@ -22,6 +22,24 @@ jobs:
         run: make install
       - name: Install and Run Tests
         run: make unit-tests
+  tests-windows:
+    name: tests-python${{ matrix.python-version }}-${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: ['3.7', '3.8', '3.9', '3.10']
+        os: ["windows-latest"]
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+          cache: 'pip'
+      - name: Install Deps
+        run: make install
+      - name: Install and Run Tests
+        run: make unit-tests
   tests-old-qiskit:
     name: tests-old-qiskit
     runs-on: ${{ matrix.os }}
@@ -49,7 +67,7 @@ jobs:
       - name: Set up Python 3.9
         uses: actions/setup-python@v4
         with:
-          python-version: 3.9
+          python-version: '3.9'
       - name: Install Deps
         run: make install
       - name: Run lint