diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index eaafe12f9..2030e0bca 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -56,7 +56,8 @@ test632 test633 test634 test635 test636 test637 test700 test701 test702	\
 test703 test704 test705 test706 test707 test708 test709 test710 \
 test800 test801 test802	\
 test803 test804 test805 test806 test807 test808 test809 test810 test811	\
-test812 test813 test1000 test1001 test1002 test1003 test1004 test1005	\
+test812 test813 test814 \
+test1000 test1001 test1002 test1003 test1004 test1005	\
 test1006 test1007 test1008 test1009 test1010 test1011 test1012 test1013	\
 test1014 test1015 test1016 test1017 test1018 test1019 test1020 test1021	\
 test1022 test1023 test1024 test1025 test1026 test1027 test1028 test1029	\
diff --git a/tests/data/test814 b/tests/data/test814
new file mode 100644
index 000000000..1fc060777
--- /dev/null
+++ b/tests/data/test814
@@ -0,0 +1,52 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+SMTP without --mail-from
+ </name>
+<stdin>
+From: different
+To: another
+
+body
+</stdin>
+ <command>
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 814@foo -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO user
+MAIL FROM:<>
+RCPT TO:<814@foo>
+DATA
+QUIT
+</protocol>
+<upload>
+From: different
+To: another
+
+body
+
+.
+</upload>
+</verify>
+</testcase>