diff --git a/ctdb/tests/simple/99_daemons_shutdown.sh b/ctdb/tests/simple/99_daemons_shutdown.sh
new file mode 100755
index 00000000000..3583828b71a
--- /dev/null
+++ b/ctdb/tests/simple/99_daemons_shutdown.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+test_info()
+{
+    cat <<EOF
+If we running local daemons and TEST_CLEANUP is true then shutdown the daemons.
+
+No error if ctdbd is not already running on the cluster.
+
+Prerequisites:
+
+* Nodes must be accessible via 'onnode'.
+EOF
+}
+
+. "${TEST_SCRIPTS_DIR}/integration.bash"
+
+# Do not call ctdb_test_init() here.  It will setup ctdb_test_exit()
+# to run and that will find the daemons missing and restart them!
+
+if [ -n "$TEST_LOCAL_DAEMONS" ] && $TEST_CLEANUP ; then
+    daemons_stop
+fi