3 files changed, 52 insertions, 1 deletions
diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 8d2ef14ce..5215f442f 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -109,7 +109,7 @@ 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 test955 test956 test957 test958 test959 test960 test961 test962 \
-test963 \
+test963 test964 \
 \
 test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \
 test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \
diff --git a/tests/data/test961 b/tests/data/test961
index 80ebca887..2e70cb404 100644
--- a/tests/data/test961
+++ b/tests/data/test961
@@ -17,6 +17,9 @@ VRFY
 <server>
 smtp
 </server>
+<features>
+!idn
+</features>
 <setenv>
 LC_ALL=en_US.UTF-8
 LC_CTYPE=en_US.UTF-8
diff --git a/tests/data/test964 b/tests/data/test964
new file mode 100644
index 000000000..326cdd21e
--- /dev/null
+++ b/tests/data/test964
@@ -0,0 +1,48 @@
+<testcase>
+<info>
+<keywords>
+SMTP
+VRFY
+IDN
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+<features>
+idn
+</features>
+<setenv>
+LC_ALL=en_US.UTF-8
+LC_CTYPE=en_US.UTF-8
+</setenv>
+<precheck>
+perl -MI18N::Langinfo=langinfo,CODESET -e 'die "Needs a UTF-8 locale" if (lc(langinfo(CODESET())) ne "utf-8");'
+</precheck>
+ <name>
+SMTP external VRFY without SMTPUTF8 support (IDN Enabled) - UTF-8 based recipient (host part only)
+ </name>
+<command>
+smtp://%HOSTIP:%SMTPPORT/964 --mail-rcpt user@åäö.se
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO 964
+VRFY user@xn--4cab6c.se
+QUIT
+</protocol>
+</verify>
+</testcase>