diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index a04872529a..836be0ad73 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -69,7 +69,7 @@ test809 \
test850 test851 test852 test853 test854 test855 test856 test857 \
\
test900 test901 test902 test903 test904 test905 test906 test907 test908 \
-test909 \
+test909 test910 test911 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test910 b/tests/data/test910
new file mode 100644
index 0000000000..5013fdc75f
--- /dev/null
+++ b/tests/data/test910
@@ -0,0 +1,52 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP without terminating CRLF
+
+
+From: different
+To: another
+
+body
+
+
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 910@foo --mail-rcpt 910@foobar.example --mail-from 910@from -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO user
+MAIL FROM:<910@from>
+RCPT TO:<910@foo>
+RCPT TO:<910@foobar.example>
+DATA
+QUIT
+
+
+From: different
+To: another
+
+body
+.
+
+
+
diff --git a/tests/data/test911 b/tests/data/test911
new file mode 100644
index 0000000000..6b7a1f40e8
--- /dev/null
+++ b/tests/data/test911
@@ -0,0 +1,48 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP with no mail data
+
+
+
+
+
+
+
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 911@foo --mail-rcpt 911@foobar.example --mail-from 911@from -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO user
+MAIL FROM:<911@from>
+RCPT TO:<911@foo>
+RCPT TO:<911@foobar.example>
+DATA
+QUIT
+
+
+
+.
+
+
+