diff --git a/tests/Makemodule.am b/tests/Makemodule.am
index 2784298..252d638 100644
--- a/tests/Makemodule.am
+++ b/tests/Makemodule.am
@@ -18,6 +18,7 @@ TESTS = \
 	tests/full-json \
 	tests/full-xml \
 	tests/leading0 \
+	tests/mustach \
 	tests/one-ip \
 	tests/one-line \
 	tests/range4 \
diff --git a/tests/expected/mustach b/tests/expected/mustach
new file mode 100644
index 0000000..f2bd27b
--- /dev/null
+++ b/tests/expected/mustach
@@ -0,0 +1,161 @@
+Subnets:
+    location: example1
+    range: 10.1.0.1 - 10.1.0.1
+    first_ip: 10.1.0.1
+    last_ip: 10.1.0.20
+    used: 10
+    touched: 0
+    defined: 20
+    free: 10
+    percent: 50
+    touch_count: 10
+    touch_percent: 50
+    backup_count: 0
+    backup_percent: 0
+    status: 0
+
+    location: example2
+    range: 10.2.0.1 - 10.2.0.1
+    first_ip: 10.2.0.1
+    last_ip: 10.2.0.20
+    used: 8
+    touched: 0
+    defined: 20
+    free: 12
+    percent: 40
+    touch_count: 8
+    touch_percent: 40
+    backup_count: 0
+    backup_percent: 0
+    status: 0
+
+    location: example2
+    range: 10.3.0.1 - 10.3.0.1
+    first_ip: 10.3.0.1
+    last_ip: 10.3.0.20
+    used: 9
+    touched: 0
+    defined: 20
+    free: 11
+    percent: 45
+    touch_count: 9
+    touch_percent: 45
+    backup_count: 0
+    backup_percent: 0
+    status: 0
+
+    location: All networks
+    range: 10.4.0.1 - 10.4.0.1
+    first_ip: 10.4.0.1
+    last_ip: 10.4.0.20
+    used: 5
+    touched: 0
+    defined: 20
+    free: 15
+    percent: 25
+    touch_count: 5
+    touch_percent: 25
+    backup_count: 1
+    backup_percent: 5
+    status: 0
+
+
+Shared-networks:
+    location: example1
+    defined: 40
+    used: 21
+    touched: 0
+    free: 19
+    percent: 52.5
+    touch_count: 21
+    touch_percent: 52.5
+    backup_count: 1
+    backup_percent: 2.5
+    status: 0
+
+    location: example2
+    defined: 40
+    used: 17
+    touched: 0
+    free: 23
+    percent: 42.5
+    touch_count: 17
+    touch_percent: 42.5
+    backup_count: 0
+    backup_percent: 0
+    status: 0
+
+
+Summary:
+    location: All networks
+    defined: 100
+    used: 43
+    touched: 0
+    free: 57
+    percent: 43
+    touch_count: 43
+    touch_percent: 43
+    backup_count: 3
+    backup_percent: 3
+    status: 0
+
+--- skip ok ---
+Subnets:
+    location: example1
+    range: 10.1.0.1 - 10.1.0.1
+    first_ip: 10.1.0.1
+    last_ip: 10.1.0.20
+    used: 10
+    touched: 0
+    defined: 20
+    free: 10
+    percent: 50
+    touch_count: 10
+    touch_percent: 50
+    backup_count: 0
+    backup_percent: 0
+    status: 1
+
+    location: example2
+    range: 10.3.0.1 - 10.3.0.1
+    first_ip: 10.3.0.1
+    last_ip: 10.3.0.20
+    used: 9
+    touched: 0
+    defined: 20
+    free: 11
+    percent: 45
+    touch_count: 9
+    touch_percent: 45
+    backup_count: 0
+    backup_percent: 0
+    status: 1
+
+
+Shared-networks:
+    location: example1
+    defined: 40
+    used: 21
+    touched: 0
+    free: 19
+    percent: 52.5
+    touch_count: 21
+    touch_percent: 52.5
+    backup_count: 1
+    backup_percent: 2.5
+    status: 1
+
+
+Summary:
+    location: All networks
+    defined: 100
+    used: 43
+    touched: 0
+    free: 57
+    percent: 43
+    touch_count: 43
+    touch_percent: 43
+    backup_count: 3
+    backup_percent: 3
+    status: 0
+
diff --git a/tests/mustach b/tests/mustach
new file mode 100755
index 0000000..4a282c6
--- /dev/null
+++ b/tests/mustach
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Minimal regression test suite.
+
+IAM=$(basename $0)
+
+if [ ! -d tests/outputs ]; then
+	mkdir tests/outputs
+fi
+
+dhcpd-pools -c $top_srcdir/samples/dhcpd.conf -l $top_srcdir/samples/dhcpd.leases \
+	--mustach $top_srcdir/samples/mustach.template -o tests/outputs/$IAM
+
+echo "--- skip ok ---" >> tests/outputs/$IAM
+dhcpd-pools -c $top_srcdir/samples/dhcpd.conf -l $top_srcdir/samples/dhcpd.leases \
+	--mustach $top_srcdir/samples/mustach.template --skip-ok --warning 44 >> tests/outputs/$IAM
+
+diff -u $top_srcdir/tests/expected/$IAM tests/outputs/$IAM
+exit $?