diff --git a/.github/workflows/test.yml b/.github/workflows/test-pypa-ubuntu.yml
similarity index 76%
rename from .github/workflows/test.yml
rename to .github/workflows/test-pypa-ubuntu.yml
index 67b0162..d5c1ad3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test-pypa-ubuntu.yml
@@ -1,9 +1,24 @@
+name: Tests (PyPA packages)
+
+on:
+  push:
+    branches:
+      - "master"
+  pull_request:
+    branches:
+      - "master"
+
 jobs:
   test:
     strategy:
       matrix:
         python-version: ["3.12", "3.11", "3.10", "3.9", "3.8", "3.7"]
         os: ["ubuntu-22.04"]
+        include:
+          - python-version: "3.6"
+            os: "ubuntu-20.04"
+          - python-version: "3.5"
+            os: "ubuntu-20.04"
 
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/test-ubuntu.yml b/.github/workflows/test-ubuntu.yml
new file mode 100644
index 0000000..2cd30c8
--- /dev/null
+++ b/.github/workflows/test-ubuntu.yml
@@ -0,0 +1,33 @@
+name: Tests (Ubuntu packages)
+
+on:
+  push:
+    branches:
+      - "master"
+  pull_request:
+    branches:
+      - "master"
+
+jobs:
+  test:
+    strategy:
+      matrix:
+        os: ["ubuntu-24.04", "ubuntu-22.04", "ubuntu-20.04"]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'true'
+      - name: Set up Python
+        run: sudo apt-get install python3
+      - name: Install requirements
+        run: sudo apt-get install python3-redis python3-hiredis python3-requests python3-zmq
+      - name: Install requirements for testing (from PyPA)
+        if: matrix.os == 'ubuntu-20.04'
+        run: python3 -m pip install mockito
+      - name: Install requirements for testing (from Ubuntu packages)
+        if: matrix.os != 'ubuntu-20.04'
+        run: sudo apt-get install python3-mockito
+      - name: Run tests
+        run: python3 -m unittest tests