diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d0d9cdee..12244d92 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -136,6 +136,12 @@ jobs:
             test: { name: "arch", case: "arch" }
           - backend: kvm
             test: { name: "apertis", case: "apertis" }
+          - backend: kvm
+            test: { name: "kali", case: "kali" }
+          - backend: kvm
+            test: { name: "apertis v2022", case: "apertis", variables: "-t suite:v2022" }
+          - backend: kvm
+            test: { name: "apertis v2024dev3", case: "apertis", variables: "-t suite:v2024dev3 -t parent_suite:bookworm" }
     name: ${{matrix.test.name}} on ${{matrix.backend}}
     runs-on: ${{ matrix.backend == 'kvm' && 'kvm' || 'ubuntu-latest' }}
     steps:
diff --git a/tests/apertis/test.yaml b/tests/apertis/test.yaml
index 4cde8606..62040447 100644
--- a/tests/apertis/test.yaml
+++ b/tests/apertis/test.yaml
@@ -1,12 +1,17 @@
 ---
 # Test building a non-debian distribution such as apertis to ensure
 # bootstrapping suites that debootstrap won't internally know about works
-{{- $architecture := or .architecture "amd64"}}
-architecture: {{$architecture}}
+
+{{- $architecture := or .architecture "amd64" }}
+{{- $suite := or .suite "v2022" }}
+{{- $parent_suite := or .parent_suite "" }}
+
+architecture: {{ $architecture }}
 
 actions:
   - action: debootstrap
-    suite: v2022
+    suite: {{ $suite }}
+    parent-suite: {{ $parent_suite }}
     components:
       - target
     mirror: https://repositories.apertis.org/apertis/
diff --git a/tests/kali/kali-archive-keyring.gpg b/tests/kali/kali-archive-keyring.gpg
new file mode 100644
index 00000000..244b2b50
Binary files /dev/null and b/tests/kali/kali-archive-keyring.gpg differ
diff --git a/tests/kali/test.yaml b/tests/kali/test.yaml
new file mode 100644
index 00000000..5a40306f
--- /dev/null
+++ b/tests/kali/test.yaml
@@ -0,0 +1,23 @@
+---
+# Test building a non-debian distribution based on unstable such as kali-rolling
+# to ensure bootstrapping suites that debootstrap won't internally know about
+# works
+{{- $architecture := or .architecture "amd64" }}
+
+architecture: {{ $architecture }}
+
+actions:
+  - action: debootstrap
+    suite: kali-rolling
+    parent-suite: testing
+    components:
+      - main
+    mirror: https://http.kali.org/kali/
+    variant: minbase
+    keyring-package: kali-archive-keyring
+    keyring-file: kali-archive-keyring.gpg
+
+  - action: apt
+    description: Install some base packages
+    packages:
+      - procps