diff --git a/ci/debug.yml b/ci/debug.yml
new file mode 100644
index 00000000..757f6d1d
--- /dev/null
+++ b/ci/debug.yml
@@ -0,0 +1,7 @@
+header:
+  version: 11
+
+# Add universally helpful features when testing boards
+local_conf_header:
+  debug: |
+    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
diff --git a/ci/testimage.yml b/ci/testimage.yml
index b4b5599b..5d402f0f 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -1,9 +1,10 @@
 header:
   version: 11
+  includes:
+    - ci/debug.yml
 
 local_conf_header:
   testimage: |
-    EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
     IMAGE_CLASSES += "testimage"
     TESTIMAGE_AUTO = "1"
   kvm: |