diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 34689cb34..007582a5f 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -74,7 +74,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 \
+test918 test919 test920 test921 test922 test923 test924 test925 test926 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test923 b/tests/data/test923
new file mode 100644
index 000000000..79f283b8d
--- /dev/null
+++ b/tests/data/test923
@@ -0,0 +1,38 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+250
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP VRFY
+
+
+smtp://%HOSTIP:%SMTPPORT/923 --mail-rcpt recipient
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO 923
+VRFY recipient
+QUIT
+
+
+
diff --git a/tests/data/test924 b/tests/data/test924
new file mode 100644
index 000000000..ec07ccd9e
--- /dev/null
+++ b/tests/data/test924
@@ -0,0 +1,41 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+553-Ambiguous; Possibilities are:
+553-Joe Smith
+553-Harry Smith
+553 Melvin Smith
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP ambiguous VRFY
+
+
+smtp://%HOSTIP:%SMTPPORT/924 --mail-rcpt smith
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO 924
+VRFY smith
+QUIT
+
+
+
diff --git a/tests/data/test925 b/tests/data/test925
new file mode 100644
index 000000000..dcc64f44f
--- /dev/null
+++ b/tests/data/test925
@@ -0,0 +1,38 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+252 Send some mail and I'll try my best
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP external VRFY
+
+
+smtp://%HOSTIP:%SMTPPORT/925 --mail-rcpt user@example.net
+
+
+
+#
+# Verify data after the test has been "shot"
+
+
+EHLO 925
+VRFY user@example.net
+QUIT
+
+
+
diff --git a/tests/data/test926 b/tests/data/test926
new file mode 100644
index 000000000..1e408949a
--- /dev/null
+++ b/tests/data/test926
@@ -0,0 +1,42 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+550 Unknown user
+
+
+#
+# Client-side
+
+
+smtp
+
+
+SMTP unknown user VRFY
+
+
+smtp://%HOSTIP:%SMTPPORT/926 --mail-rcpt recipient
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 56 - CURLE_RECV_ERROR
+
+56
+
+
+EHLO 926
+VRFY recipient
+QUIT
+
+
+