diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 21ca571ef..6cc6beb17 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -108,7 +108,7 @@ test918 test919 test920 test921 test922 test923 test924 test925 test926 \
test927 test928 test929 test930 test931 test932 test933 test934 test935 \
test936 test937 test938 test939 test940 test941 test942 test943 test944 \
test945 test946 test947 test948 test949 test950 test951 test952 test953 \
-test954 \
+test954 test955 test956 test957 test958 test959 test960 test961 \
\
test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test955 b/tests/data/test955
new file mode 100644
index 000000000..ce7ef18b0
--- /dev/null
+++ b/tests/data/test955
@@ -0,0 +1,53 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP without SMTPUTF8 support - UTF-8 based sender (local part only)
+
+
+From: different
+To: another
+
+body
+
+
+smtp://%HOSTIP:%SMTPPORT/955 --mail-rcpt recipient@example.com --mail-from Avsändaren@example.com -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 55 - CURLE_SEND_ERROR
+
+55
+
+
+EHLO 955
+MAIL FROM:
+QUIT
+
+
+
diff --git a/tests/data/test956 b/tests/data/test956
new file mode 100644
index 000000000..51a978e92
--- /dev/null
+++ b/tests/data/test956
@@ -0,0 +1,54 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP without SMTPUTF8 support - UTF-8 based recipient (local part only)
+
+
+From: different
+To: another
+
+body
+
+
+smtp://%HOSTIP:%SMTPPORT/956 --mail-rcpt Stödmottagaren@example.com --mail-from sender@example.com -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 55 - CURLE_SEND_ERROR
+
+55
+
+
+EHLO 956
+MAIL FROM:
+RCPT TO:
+QUIT
+
+
+
diff --git a/tests/data/test957 b/tests/data/test957
new file mode 100644
index 000000000..ceb092f6c
--- /dev/null
+++ b/tests/data/test957
@@ -0,0 +1,48 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
+
+
+smtp://%HOSTIP:%SMTPPORT/957 --mail-rcpt Användaren
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 56 - CURLE_RECV_ERROR
+
+56
+
+
+EHLO 957
+VRFY Användaren
+QUIT
+
+
+
diff --git a/tests/data/test958 b/tests/data/test958
new file mode 100644
index 000000000..7f974b8b5
--- /dev/null
+++ b/tests/data/test958
@@ -0,0 +1,48 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (local part only)
+
+
+smtp://%HOSTIP:%SMTPPORT/958 --mail-rcpt Användaren@example.com
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 56 - CURLE_RECV_ERROR
+
+56
+
+
+EHLO 958
+VRFY Användaren@example.com
+QUIT
+
+
+
diff --git a/tests/data/test959 b/tests/data/test959
new file mode 100644
index 000000000..519aca45a
--- /dev/null
+++ b/tests/data/test959
@@ -0,0 +1,53 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP without SMTPUTF8 support - UTF-8 based sender (host part only)
+
+
+From: different
+To: another
+
+body
+
+
+smtp://%HOSTIP:%SMTPPORT/959 --mail-rcpt recipient@example.com --mail-from sender@åäö.se -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 55 - CURLE_SEND_ERROR
+
+55
+
+
+EHLO 959
+MAIL FROM:
+QUIT
+
+
+
diff --git a/tests/data/test960 b/tests/data/test960
new file mode 100644
index 000000000..d164aa83c
--- /dev/null
+++ b/tests/data/test960
@@ -0,0 +1,54 @@
+
+
+
+SMTP
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP without SMTPUTF8 support - UTF-8 based recipient (host part only)
+
+
+From: different
+To: another
+
+body
+
+
+smtp://%HOSTIP:%SMTPPORT/960 --mail-rcpt recipient@åäö.se --mail-from sender@example.com -T -
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 55 - CURLE_SEND_ERROR
+
+55
+
+
+EHLO 960
+MAIL FROM:
+RCPT TO:
+QUIT
+
+
+
diff --git a/tests/data/test961 b/tests/data/test961
new file mode 100644
index 000000000..80ebca887
--- /dev/null
+++ b/tests/data/test961
@@ -0,0 +1,48 @@
+
+
+
+SMTP
+VRFY
+
+
+
+#
+# Server-side
+
+
+
+#
+# Client-side
+
+
+smtp
+
+
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+
+
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+
+
+SMTP external VRFY without SMTPUTF8 support - UTF-8 based recipient (host part only)
+
+
+smtp://%HOSTIP:%SMTPPORT/961 --mail-rcpt user@åäö.se
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# 56 - CURLE_RECV_ERROR
+
+56
+
+
+EHLO 961
+VRFY user@åäö.se
+QUIT
+
+
+