diff --git a/config/os-test.toml b/config/os-test.toml
new file mode 100644
index 00000000..73f25c28
--- /dev/null
+++ b/config/os-test.toml
@@ -0,0 +1,21 @@
+# Configuration for testing
+
+include = ["server.toml"]
+
+# General settings
+[general]
+# Filesystem size in MiB
+filesystem_size = 1024
+# Do not prompt if settings are not defined
+prompt = false
+
+# Package settings
+[packages]
+os-test-bins = {} # Provides source and cross-compiled binaries
+
+[[files]]
+path = "/usr/lib/init.d/30_console"
+data = """
+os-test-runner
+shutdown
+"""
diff --git a/config/x86_64/os-test.toml b/config/x86_64/os-test.toml
new file mode 100644
index 00000000..23693cbe
--- /dev/null
+++ b/config/x86_64/os-test.toml
@@ -0,0 +1,14 @@
+# Configuration for testing
+
+include = ["../os-test.toml"]
+
+# Override the default settings here
+
+# General settings
+[general]
+# Filesystem size in MiB
+# filesystem_size = 1024
+
+# Package settings
+[packages]
+# example = {}
diff --git a/mk/ci.mk b/mk/ci.mk
index 84dc2aa3..b0e35048 100644
--- a/mk/ci.mk
+++ b/mk/ci.mk
@@ -21,6 +21,19 @@ server desktop demo: FORCE
 	cp "build/$(ARCH)/$@/harddrive.img" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_harddrive.img"
 	cp "build/$(ARCH)/$@/redox-live.iso" "$(IMG_DIR)/redox_$(@)$(IMG_SEPARATOR)$(IMG_TAG)_livedisk.iso"
 
+ci-os-test: FORCE
+	make CONFIG_NAME=os-test unmount
+	rm -f "build/$(ARCH)/os-test/harddrive.img"
+	$(MAKE) CONFIG_NAME=os-test qemu gpu=no
+	$(MAKE) CONFIG_NAME=os-test mount
+	tar \
+		--create \
+		--gzip \
+		--file "build/$(ARCH)/os-test/os-test.tar.gz" \
+		--directory="build/$(ARCH)/os-test/filesystem/usr/share/os-test" \
+		html os-test.json out
+	$(MAKE) CONFIG_NAME=os-test unmount
+
 # CI packaging target
 ci-pkg: prefix $(FSTOOLS_TAG) $(CONTAINER_TAG) FORCE
 ifeq ($(PODMAN_BUILD),1)