diff --git a/CHANGES b/CHANGES
index 974a07b9938a7c7951334d9a9c51a593a1cd1584..81f09e858d4728d9572d74aca1134659dd2ce543 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (7 Jul 2008)
+- Added test cases 1034 & 1035 to test IDN name conversion failures.
+
 Daniel Stenberg (7 Jul 2008)
 - Scott Barrett provided a test case for a segfault in the FTP code and the
   fix for it. It occured when you did a FTP transfer using
diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 11d121e597e7fda1a5c212c9292e4fda71a087c1..4ad314f5e103ba2805bb80a0127aafada7599dc0 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -51,7 +51,8 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1021 test1022 test1023 test309 test616 test617 test618 test619        \
  test620 test621 test622 test623 test624 test625 test626 test627 test554   \
  test1024 test1025 test555 test1026 test1027 test1028 test1029 test1030    \
- test556 test1031 test628 test629 test630 test631 test632 test1032 test1033
+ test556 test1031 test628 test629 test630 test631 test632 test1032 test1033 \
+ test539 test1034 test1035
 
 filecheck:
 	@mkdir test-place; \
diff --git a/tests/data/test1034 b/tests/data/test1034
new file mode 100644
index 0000000000000000000000000000000000000000..09b8406f6f8138c64291d6dff94a122d0351b7d2
--- /dev/null
+++ b/tests/data/test1034
@@ -0,0 +1,62 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+IDN
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.0 503 Service Unavailable
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+idn
+</features>
+<setenv>
+CHARSET=UTF-8
+</setenv>
+ <name>
+HTTP over proxy with malformatted IDN host name
+ </name>
+
+# This host name contains an invalid UTF-8 byte sequence that can't be
+# converted into an IDN name
+ <command>
+http://invalid-utf8-â.local/page/1034 -x %HOSTIP:%HTTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://invalid-utf8-â.local/page/1034 HTTP/1.1
+Host: invalid-utf8-â.local
+Pragma: no-cache
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test1035 b/tests/data/test1035
new file mode 100644
index 0000000000000000000000000000000000000000..f982d9d4cf6015bddaf4611078129b5b9af5390f
--- /dev/null
+++ b/tests/data/test1035
@@ -0,0 +1,59 @@
+<testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+IDN
+FAILURE
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<data>
+HTTP/1.0 503 Service Unavailable
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
+</data>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+http
+</server>
+<features>
+idn
+</features>
+<setenv>
+CHARSET=ISO8859-1
+</setenv>
+ <name>
+HTTP over proxy with too long IDN host name
+ </name>
+ <command>
+http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 -x %HOSTIP:%HTTPPORT
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<strip>
+^User-Agent:.*
+</strip>
+<protocol>
+GET http://too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local/page/1035 HTTP/1.1
+Host: too-long-IDN-name-cürl-rüles-la-la-la-dee-da-flooby-nooby.local
+Pragma: no-cache
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol>
+</verify>
+</testcase>
diff --git a/tests/data/test165 b/tests/data/test165
index 812f1ef3a05d062c29d5b577f1751ff257c1e636..264d59c9987b96050f5b59cf420ae9369aa300ca 100644
--- a/tests/data/test165
+++ b/tests/data/test165
@@ -1,14 +1,22 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+HTTP GET
+IDN
+</keywords>
+</info>
+
 #
 # Server-side
 <reply>
 <data>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake swsclose
-Content-Type: text/html
-Funny-head: yesyes
-
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake swsclose
+Content-Type: text/html
+Funny-head: yesyes
+
 </data>
 </reply>