diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 6bc8ce3c5..18120374a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -67,7 +67,7 @@ test800 test801 test802 test803 test804 test805 test806 test807 test808 \
\
test850 test851 test852 test853 test854 test855 test856 test857 \
\
-test900 test901 test902 test903 test904 test905 test906 \
+test900 test901 test902 test903 test904 test905 test906 test907 test908 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test907 b/tests/data/test907
new file mode 100644
index 000000000..d7a25e5b4
--- /dev/null
+++ b/tests/data/test907
@@ -0,0 +1,54 @@
+
+
+
+SMTP
+SMTP AUTH PLAIN SASL-IR
+RFC4616
+RFC4954
+
+
+
+#
+# Server-side
+
+
+REPLY EHLO 250 AUTH PLAIN
+REPLY AUTH 235 Authenticated
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP plain authentication with initial response
+
+
+mail body
+
+
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 907@foo --mail-from 907@from -u test:1234 -T --sasl-ir -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO user
+AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
+MAIL FROM:<907@from>
+RCPT TO:<907@foo>
+DATA
+QUIT
+
+
+mail body
+
+.
+
+
+
diff --git a/tests/data/test908 b/tests/data/test908
new file mode 100644
index 000000000..8f3824d2f
--- /dev/null
+++ b/tests/data/test908
@@ -0,0 +1,55 @@
+
+
+
+SMTP
+SMTP AUTH LOGIN SASL-IR
+RFC4954
+
+
+
+#
+# Server-side
+
+
+REPLY EHLO 250 AUTH LOGIN
+REPLY AUTH 334 UGFzc3dvcmQ6
+REPLY MTIzNA== 235 Authenticated
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP login authentication with initial response
+
+
+mail body
+
+
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 908@foo --mail-from 908@from -u test:1234 -T --sasl-ir -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO user
+AUTH LOGIN dGVzdA==
+MTIzNA==
+MAIL FROM:<908@from>
+RCPT TO:<908@foo>
+DATA
+QUIT
+
+
+mail body
+
+.
+
+
+