diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index b8c16c7ca..3094d642a 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -63,7 +63,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1089 test1090 test1091 test1092 test1093 test1094 test1095 test1096   \
  test1097 test560 test561 test1098 test1099 test562 test563 test1100       \
  test564 test1101 test1102 test1103 test1104 test299 test310 test311       \
- test312 test1105 test565 test800 test1106 test801 test566
+ test312 test1105 test565 test800 test1106 test801 test566 test802
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test802 b/tests/data/test802
new file mode 100644
index 000000000..9c7013a5c
--- /dev/null
+++ b/tests/data/test802
@@ -0,0 +1,48 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+SMTP
+ </name>
+<stdin>
+From: different
+To: another
+
+body
+</stdin>
+ <command>
+smtp://%HOSTIP:%SMTPPORT -u user:secret --mail-rcpt 802@foo --mail-from 802@from -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO user
+MAIL FROM:802@from
+RCPT TO:802@foo
+DATA
+From: different
+To: another
+
+body
+QUIT
+</protocol>
+</verify>
+</testcase>