diff --git a/CHANGES b/CHANGES
index 2b26a051e0..ccc7e364b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,11 @@
 
                                   Changelog
 
+Daniel Fandrich (20 May 2009)
+- Added "non-existing host" test keywords to make it easy to skip those
+  tests on machines that have broken DNS configurations (such as
+  those configured to use OpenDNS).
+
 Daniel Stenberg (19 May 2009)
 - Kamil Dudka brought the patch from the Redhat bug entry
   https://bugzilla.redhat.com/show_bug.cgi?id=427966 which was libcurl closing
diff --git a/tests/data/test1084 b/tests/data/test1084
index c2b54f3c9d..2bc0183a7f 100644
--- a/tests/data/test1084
+++ b/tests/data/test1084
@@ -5,6 +5,7 @@ HTTP
 HTTP GET
 --interface
 FAILURE
+non-existing host
 </keywords>
 </info>
 
diff --git a/tests/data/test1085 b/tests/data/test1085
index 04d5e28859..0cedefe3be 100644
--- a/tests/data/test1085
+++ b/tests/data/test1085
@@ -6,6 +6,7 @@ HTTP GET
 --interface
 IPv6
 FAILURE
+non-existing host
 </keywords>
 </info>
 
diff --git a/tests/data/test20 b/tests/data/test20
index 3d7a6dab96..57fa48dea9 100644
--- a/tests/data/test20
+++ b/tests/data/test20
@@ -1,10 +1,12 @@
 <testcase>
 <info>
 <keywords>
-non-existing host name
+HTTP
 FAILURE
+non-existing host
 </keywords>
 </info>
+
 # Server-side
 <reply>
 <data>
diff --git a/tests/data/test507 b/tests/data/test507
index 8abbb62a1f..9549bd986f 100644
--- a/tests/data/test507
+++ b/tests/data/test507
@@ -1,4 +1,13 @@
 <testcase>
+<info>
+<keywords>
+HTTP
+multi
+FAILURE
+non-existing host
+</keywords>
+</info>
+
 # Server-side
 <reply>
 </reply>
diff --git a/tests/data/test534 b/tests/data/test534
index 52bb1e2604..6045dba617 100644
--- a/tests/data/test534
+++ b/tests/data/test534
@@ -5,6 +5,7 @@ FTP
 PASV
 RETR
 multi
+non-existing host
 </keywords>
 </info>