diff --git a/.github/workflows/python_pytest.yml b/.github/workflows/python_pytest.yml
index 3c20f8b7..96341719 100644
--- a/.github/workflows/python_pytest.yml
+++ b/.github/workflows/python_pytest.yml
@@ -182,7 +182,8 @@ jobs:
       run: poetry install
 
     # Job-specific step(s):
-    - name: Run Pytest
+    - name: Run Pytest [all]
+      if: matrix.os != 'Windows'
       timeout-minutes: 60
       env:
         GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
@@ -191,6 +192,17 @@ jobs:
         --verbose
         -m "not linting and not super_slow and not flaky"
 
+    - name: Run Pytest [unit tests only]
+      if: matrix.os == 'Windows'
+      timeout-minutes: 60
+      env:
+        GCP_GSM_CREDENTIALS: ${{ secrets.GCP_GSM_CREDENTIALS }}
+      run: >
+        poetry run coverage run -m pytest
+        --verbose
+        tests/unit_tests/
+        -m "not linting and not super_slow and not flaky"
+
     - name: Print Coverage Report
       if: always()
       run: poetry run coverage report
diff --git a/pyproject.toml b/pyproject.toml
index cb835a5a..0287ed30 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -183,6 +183,7 @@ airbyte-mcp = "airbyte.mcp.server:main"
 [tool.poe.tasks]
 test = { shell = "pytest" }
 test-fast = { shell = "pytest --durations=5 --exitfirst -m 'not slow'" }
+test-unit-tests = { shell = "pytest tests/unit_tests/" }
 
 coverage = { shell = "coverage run -m pytest && coverage report" }
 coverage-report = { shell = "coverage report" }