diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ffcd2b95..ef1b53b09 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -124,6 +124,7 @@ TESTS +=  \
 	diskq-rfc5424.sh \
 	diskqueue.sh \
 	diskqueue-fsync.sh \
+	diskqueue-full.sh \
 	rulesetmultiqueue.sh \
 	rulesetmultiqueue-v6.sh \
 	manytcp.sh \
@@ -967,6 +968,7 @@ EXTRA_DIST= \
 	rsf_getenv.sh \
 	testsuites/rsf_getenv.conf \
 	diskq-rfc5424.sh \
+	diskqueue-full.sh \
 	diskqueue.sh \
 	testsuites/diskqueue.conf \
 	arrayqueue.sh \
diff --git a/tests/diskqueue-full.sh b/tests/diskqueue-full.sh
new file mode 100755
index 000000000..78e960a0a
--- /dev/null
+++ b/tests/diskqueue-full.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+# checks that nothing bad happens if a DA (disk) queue runs out
+# of configured disk space
+# addd 2017-02-07 by RGerhards, released under ASL 2.0
+. $srcdir/diag.sh init
+
+. $srcdir/diag.sh generate-conf
+. $srcdir/diag.sh add-conf '
+module(load="../plugins/omtesting/.libs/omtesting")
+global(workDirectory="test-spool")
+main_queue(queue.filename="mainq" queue.maxDiskSpace="4m"
+	queue.maxfilesize="1m"
+	queue.timeoutenqueue="300000"
+	queue.lowwatermark="5000"
+)
+
+module(load="../plugins/imtcp/.libs/imtcp")
+$InputTCPServerRun 13514
+
+template(name="outfmt" type="string"
+	 string="%msg:F,58:2%,%msg:F,58:3%,%msg:F,58:4%\n")
+
+:omtesting:sleep 0 5000
+:msg, contains, "msgnum:" action(type="omfile" template="outfmt"
+			         file="rsyslog.out.log")
+'
+. $srcdir/diag.sh startup
+. $srcdir/diag.sh injectmsg 0 20000
+ls -l test-spool
+. $srcdir/diag.sh shutdown-when-empty
+. $srcdir/diag.sh wait-shutdown
+ls -l test-spool
+. $srcdir/diag.sh seq-check 0 19999
+
+. $srcdir/diag.sh exit