diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index f8d6d06d2..617db7779 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -75,7 +75,7 @@ test868 test869 test870 test871 test872 test873 test874 \
 test900 test901 test902 test903 test904 test905 test906 test907 test908 \
 test909 test910 test911 test912 test913 test914 test915 test916 test917 \
 test918 test919 test920 test921 test922 test923 test924 test925 test926 \
-test927 \
+test927 test928 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test928 b/tests/data/test928
new file mode 100644
index 000000000..8f6795a6a
--- /dev/null
+++ b/tests/data/test928
@@ -0,0 +1,39 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+HELP
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+214-This server supports the following commands:
+214 214 HELO EHLO RCPT DATA RSET MAIL VRFY EXPN QUIT HELP
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+SMTP HELP
+ </name>
+ <command>
+smtp://%HOSTIP:%SMTPPORT/928
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO 928
+HELP
+QUIT
+</protocol>
diff --git a/tests/ftpserver.pl b/tests/ftpserver.pl
index a116850aa..d71dc8a24 100755
--- a/tests/ftpserver.pl
+++ b/tests/ftpserver.pl
@@ -999,10 +999,10 @@ sub HELP_smtp {
     sendcontrol "214-This server supports the following commands:\r\n";
 
     if(@auth_mechs) {
-        sendcontrol "214 HELO EHLO RCPT DATA RSET MAIL QUIT HELP AUTH\r\n";
+        sendcontrol "214 HELO EHLO RCPT DATA RSET MAIL VRFY EXPN QUIT HELP AUTH\r\n";
     }
     else {
-        sendcontrol "214 HELO EHLO RCPT DATA RSET MAIL QUIT HELP\r\n";
+        sendcontrol "214 HELO EHLO RCPT DATA RSET MAIL VRFY EXPN QUIT HELP\r\n";
     }
 
     return 0;