diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
index 84bd48d..6379206 100644
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@@ -147,7 +147,6 @@ jobs:
     - test-ergo
     - test-inspircd
     - test-inspircd-anope
-    - test-inspircd-atheme
     - test-limnoria
     - test-solanum
     - test-sopel
@@ -273,38 +272,6 @@ jobs:
       with:
         name: pytest results inspircd-anope (devel)
         path: pytest.xml
-  test-inspircd-atheme:
-    needs:
-    - build-inspircd
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
-    - name: Download build artefacts
-      uses: actions/download-artifact@v2
-      with:
-        name: installed-inspircd
-        path: '~'
-    - name: Unpack artefacts
-      run: cd ~; find -name 'artefacts-*.tar.gz' -exec tar -xzf '{}' \;
-    - name: Install Atheme
-      run: sudo apt-get install atheme-services
-    - name: Install irctest dependencies
-      run: |-
-        python -m pip install --upgrade pip
-        pip install pytest -r requirements.txt
-    - name: Test with pytest
-      run: PYTEST_ARGS='--junit-xml pytest.xml' PATH=$HOME/.local/bin:$PATH PYTEST_ARGS="$PYTEST_ARGS
-        -m 'not services'" PATH=~/.local/inspircd/bin:$PATH make inspircd-atheme
-    - if: always()
-      name: Publish results
-      uses: actions/upload-artifact@v2
-      with:
-        name: pytest results inspircd-atheme (devel)
-        path: pytest.xml
   test-limnoria:
     needs: []
     runs-on: ubuntu-latest
diff --git a/make_workflows.py b/make_workflows.py
index 3265df6..8a98ef3 100644
--- a/make_workflows.py
+++ b/make_workflows.py
@@ -136,6 +136,9 @@ def get_build_job(*, software_config, software_id, version_flavor):
 
 
 def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
+    if version_flavor.value in test_config.get("exclude_versions", []):
+        return None
+
     env = ""
     needs = []
     downloads = []
diff --git a/workflows.yml b/workflows.yml
index 77a9e76..332e3d0 100644
--- a/workflows.yml
+++ b/workflows.yml
@@ -154,9 +154,7 @@ tests:
 
     inspircd-atheme:
         software: [inspircd]
-        env:
-            # Atheme does not support Insp4 yet, so it fails to connect
-            devel: "PYTEST_ARGS=\"$PYTEST_ARGS -m 'not services'\""
+        exclude_versions: [devel] # Atheme does not support Insp4 yet, so it fails to connect
 
     inspircd-anope:
         software: [inspircd, anope]