diff --git a/debian/changelog b/debian/changelog
index 2af8c26b..900ecf4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.407) UNRELEASED; urgency=medium
+
+  * Add a basic build-time syntax check for live-build/auto/*.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 20 Apr 2016 21:22:50 +0100
+
 livecd-rootfs (2.406) xenial; urgency=medium
 
   * Fix syntax error.
diff --git a/debian/rules b/debian/rules
index 24316ff0..5e853009 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,12 @@
 
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+override_dh_auto_test:
+	dh_auto_test
+	set -e; for x in live-build/auto/*; do \
+		sh -n "$$x"; \
+	done
+
 override_dh_install:
 	dh_install
 	find debian/livecd-rootfs -type f -print0 | \