diff --git a/.github/workflows/test-devel.yml b/.github/workflows/test-devel.yml
index 5ad45c2..3331785 100644
--- a/.github/workflows/test-devel.yml
+++ b/.github/workflows/test-devel.yml
@@ -148,8 +148,10 @@ jobs:
     - test-solanum
     - test-ergo
     - test-inspircd
+    - test-inspircd-atheme
     - test-inspircd-anope
     - test-unrealircd
+    - test-unrealircd-atheme
     - test-unrealircd-anope
     - test-limnoria
     - test-sopel
@@ -304,6 +306,38 @@ jobs:
       with:
         name: pytest results 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 (devel)
+        path: pytest.xml
   test-limnoria:
     needs: []
     runs-on: ubuntu-latest
@@ -458,6 +492,38 @@ jobs:
       with:
         name: pytest results anope (devel)
         path: pytest.xml
+  test-unrealircd-atheme:
+    needs:
+    - build-unrealircd
+    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-unrealircd
+        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  PATH=~/.local/unrealircd/bin:$PATH
+        make unrealircd-atheme
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results unrealircd (devel)
+        path: pytest.xml
 name: irctest with devel versions
 'on':
   schedule:
diff --git a/.github/workflows/test-devel_release.yml b/.github/workflows/test-devel_release.yml
index 13e5dd7..e604eca 100644
--- a/.github/workflows/test-devel_release.yml
+++ b/.github/workflows/test-devel_release.yml
@@ -68,8 +68,10 @@ jobs:
     - test-solanum
     - test-ergo
     - test-inspircd
+    - test-inspircd-atheme
     - test-inspircd-anope
     - test-unrealircd
+    - test-unrealircd-atheme
     - test-unrealircd-anope
     - test-limnoria
     - test-sopel
@@ -209,6 +211,38 @@ jobs:
       with:
         name: pytest results anope (devel_release)
         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  PATH=~/.local/inspircd/bin:$PATH
+        make inspircd-atheme
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results inspircd (devel_release)
+        path: pytest.xml
   test-limnoria:
     needs: []
     runs-on: ubuntu-latest
@@ -359,6 +393,38 @@ jobs:
       with:
         name: pytest results anope (devel_release)
         path: pytest.xml
+  test-unrealircd-atheme:
+    needs:
+    - build-unrealircd
+    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-unrealircd
+        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  PATH=~/.local/unrealircd/bin:$PATH
+        make unrealircd-atheme
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results unrealircd (devel_release)
+        path: pytest.xml
 name: irctest with devel_release versions
 'on':
   schedule:
diff --git a/.github/workflows/test-stable.yml b/.github/workflows/test-stable.yml
index d576960..97e89ae 100644
--- a/.github/workflows/test-stable.yml
+++ b/.github/workflows/test-stable.yml
@@ -186,8 +186,10 @@ jobs:
     - test-solanum
     - test-ergo
     - test-inspircd
+    - test-inspircd-atheme
     - test-inspircd-anope
     - test-unrealircd
+    - test-unrealircd-atheme
     - test-unrealircd-anope
     - test-limnoria
     - test-sopel
@@ -342,6 +344,38 @@ jobs:
       with:
         name: pytest results anope (stable)
         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  PATH=~/.local/inspircd/bin:$PATH
+        make inspircd-atheme
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results inspircd (stable)
+        path: pytest.xml
   test-limnoria:
     needs: []
     runs-on: ubuntu-latest
@@ -496,6 +530,38 @@ jobs:
       with:
         name: pytest results anope (stable)
         path: pytest.xml
+  test-unrealircd-atheme:
+    needs:
+    - build-unrealircd
+    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-unrealircd
+        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  PATH=~/.local/unrealircd/bin:$PATH
+        make unrealircd-atheme
+    - if: always()
+      name: Publish results
+      uses: actions/upload-artifact@v2
+      with:
+        name: pytest results unrealircd (stable)
+        path: pytest.xml
 name: irctest with stable versions
 'on':
   pull_request: null
diff --git a/Makefile b/Makefile
index da994f5..0543a89 100644
--- a/Makefile
+++ b/Makefile
@@ -109,9 +109,16 @@ ergo:
 		-k "$(ERGO_SELECTORS)"
 
 inspircd:
+	$(PYTEST) $(PYTEST_ARGS) \
+		--controller=irctest.controllers.inspircd \
+		-m 'not services' \
+		-k '$(INSPIRCD_SELECTORS)'
+
+inspircd-atheme:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.inspircd \
 		--services-controller=irctest.controllers.atheme_services \
+		-m 'services' \
 		-k '$(INSPIRCD_SELECTORS)'
 
 inspircd-anope:
@@ -143,9 +150,16 @@ sopel:
 		-k '$(SOPEL_SELECTORS)'
 
 unrealircd:
+	$(PYTEST) $(PYTEST_ARGS) \
+		--controller=irctest.controllers.unrealircd \
+		-m 'not services' \
+		-k '$(UNREALIRCD_SELECTORS)'
+
+unrealircd-atheme:
 	$(PYTEST) $(PYTEST_ARGS) \
 		--controller=irctest.controllers.unrealircd \
 		--services-controller=irctest.controllers.atheme_services \
+		-m 'services' \
 		-k '$(UNREALIRCD_SELECTORS)'
 
 unrealircd-anope:
diff --git a/workflows.yml b/workflows.yml
index bb4c668..31905d3 100644
--- a/workflows.yml
+++ b/workflows.yml
@@ -155,12 +155,18 @@ tests:
     inspircd:
         software: [inspircd]
 
+    inspircd-atheme:
+        software: [inspircd]
+
     inspircd-anope:
         software: [inspircd, anope]
 
     unrealircd:
         software: [unrealircd]
 
+    unrealircd-atheme:
+        software: [unrealircd]
+
     unrealircd-anope:
         software: [unrealircd, anope]