diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 11004ed3..8021ca22 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -7,12 +7,17 @@ concurrency:
   group: ${{ github.ref }}-${{ github.workflow }}-${{ github.event_name }}-${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) && github.sha || '' }}
   cancel-in-progress: true
 jobs:
-  linux:
+  py3:
+    name: "py3-${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 20
     strategy:
+      fail-fast: false
       matrix:
-        python-version: ["3.11"]
-        os: [ubuntu-latest]
+        include:
+        - {os: ubuntu-latest, arch: x86_64}
+        # - {os: macos-12, arch: x86_64}
+        - {os: windows-2019, arch: x86}
 
     steps:
       - uses: actions/checkout@v4
@@ -24,44 +29,20 @@ jobs:
 
       - name: Install pydeps
         run: |
-          make setup-dev-env PYTHON=python
-
-      - name: Tests
-        run: |
-          make test PYTHON=python
-
-  windows:
-    runs-on: windows-2019
-    strategy:
-      matrix:
-        python-version: ["3.11"]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install pydeps
-        run: |
-          python.exe -m pip install --upgrade --user setuptools pip wheel
-          python.exe -m pip install --upgrade mock ipaddress pypiwin32 wmi pyopenssl psutil pytest
-          python.exe -m pip freeze
-          python.exe setup.py install
+          make setup-dev-env
 
       - name: Tests
         run: |
           make test
 
-  # Run linters
-  linters:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-python@v5
-    - name: 'Run linters'
-      run: |
-        python3 -m pip install --upgrade black ruff rstcheck toml-sort sphinx-rtd-theme
-        python3 -m pip freeze
-        make lint-all
+  # # Run linters
+  # linters:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #   - uses: actions/checkout@v4
+  #   - uses: actions/setup-python@v5
+  #   - name: 'Run linters'
+  #     run: |
+  #       python3 -m pip install --upgrade black ruff rstcheck toml-sort sphinx-rtd-theme
+  #       python3 -m pip freeze
+  #       make lint-all