diff --git a/tests/data/test1008 b/tests/data/test1008
index ce79dfe67e..6154446866 100644
--- a/tests/data/test1008
+++ b/tests/data/test1008
@@ -87,7 +87,7 @@ NTLM
 HTTP proxy CONNECT auth NTLM with chunked-encoded 407 response
  </name>
  <command>
-http://test.remote.server.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
+http://test.remote.haxx.se:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
 </client>
 
@@ -102,19 +102,19 @@ http://test.remote.server.com:1008/path/10080002 --proxy http://%HOSTIP:%HTTPPOR
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:1008 HTTP/1.1
-Host: test.remote.server.com:1008
+CONNECT test.remote.haxx.se:1008 HTTP/1.1
+Host: test.remote.haxx.se:1008
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:1008 HTTP/1.1
-Host: test.remote.server.com:1008
+CONNECT test.remote.haxx.se:1008 HTTP/1.1
+Host: test.remote.haxx.se:1008
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 GET /path/10080002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:1008
+Host: test.remote.haxx.se:1008
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test1021 b/tests/data/test1021
index e08aad19d3..233cbc4db4 100644
--- a/tests/data/test1021
+++ b/tests/data/test1021
@@ -96,7 +96,7 @@ NTLM
 HTTP proxy CONNECT with any proxyauth and proxy offers NTLM and close
  </name>
  <command>
-http://test.remote.server.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
+http://test.remote.haxx.se:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-anyauth --proxytunnel
 </command>
 </client>
 
@@ -111,23 +111,23 @@ http://test.remote.server.com:1021/path/10210002 --proxy http://%HOSTIP:%HTTPPOR
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:1021 HTTP/1.1
-Host: test.remote.server.com:1021
+CONNECT test.remote.haxx.se:1021 HTTP/1.1
+Host: test.remote.haxx.se:1021
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:1021 HTTP/1.1
-Host: test.remote.server.com:1021
+CONNECT test.remote.haxx.se:1021 HTTP/1.1
+Host: test.remote.haxx.se:1021
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:1021 HTTP/1.1
-Host: test.remote.server.com:1021
+CONNECT test.remote.haxx.se:1021 HTTP/1.1
+Host: test.remote.haxx.se:1021
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 GET /path/10210002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:1021
+Host: test.remote.haxx.se:1021
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test1060 b/tests/data/test1060
index 3e0c77661a..767a7ccc99 100644
--- a/tests/data/test1060
+++ b/tests/data/test1060
@@ -874,7 +874,7 @@ crypto
 HTTP proxy CONNECT auth Digest, large headers and data
  </name>
  <command>
-http://test.remote.server.com:1060/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se:1060/path/10600002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -884,17 +884,17 @@ http://test.remote.server.com:1060/path/10600002 --proxy http://%HOSTIP:%HTTPPOR
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:1060 HTTP/1.1
-Host: test.remote.server.com:1060
+CONNECT test.remote.haxx.se:1060 HTTP/1.1
+Host: test.remote.haxx.se:1060
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:1060 HTTP/1.1
-Host: test.remote.server.com:1060
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:1060", response="b527d164630481e2cc48c04d18ed2212"
+CONNECT test.remote.haxx.se:1060 HTTP/1.1
+Host: test.remote.haxx.se:1060
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:1060", response="79e394ffcd42b6c771c7582da1fc4498"
 Proxy-Connection: Keep-Alive
 
 GET /path/10600002 HTTP/1.1
-Host: test.remote.server.com:1060
+Host: test.remote.haxx.se:1060
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test1061 b/tests/data/test1061
index 59c14faad9..0fb8c51104 100644
--- a/tests/data/test1061
+++ b/tests/data/test1061
@@ -879,7 +879,7 @@ crypto
 HTTP proxy CONNECT auth Digest, large headers and chunked data
  </name>
  <command>
-http://test.remote.server.com:1061/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se:1061/path/10610002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -889,17 +889,17 @@ http://test.remote.server.com:1061/path/10610002 --proxy http://%HOSTIP:%HTTPPOR
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:1061 HTTP/1.1
-Host: test.remote.server.com:1061
+CONNECT test.remote.haxx.se:1061 HTTP/1.1
+Host: test.remote.haxx.se:1061
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:1061 HTTP/1.1
-Host: test.remote.server.com:1061
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:1061", response="244a8caab5f343a1a20d2425e4d6e951"
+CONNECT test.remote.haxx.se:1061 HTTP/1.1
+Host: test.remote.haxx.se:1061
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:1061", response="8e96acf6a6214012183879e28e73b2d3"
 Proxy-Connection: Keep-Alive
 
 GET /path/10610002 HTTP/1.1
-Host: test.remote.server.com:1061
+Host: test.remote.haxx.se:1061
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test206 b/tests/data/test206
index 3d7c429cde..caf9113f1c 100644
--- a/tests/data/test206
+++ b/tests/data/test206
@@ -71,7 +71,7 @@ crypto
 HTTP proxy CONNECT auth Digest
  </name>
  <command>
-http://test.remote.server.com:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
+http://test.remote.haxx.se:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-digest --proxytunnel
 </command>
 </client>
 
@@ -81,18 +81,18 @@ http://test.remote.server.com:206/path/2060002 --proxy http://%HOSTIP:%HTTPPORT
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:206 HTTP/1.1
-Host: test.remote.server.com:206
+CONNECT test.remote.haxx.se:206 HTTP/1.1
+Host: test.remote.haxx.se:206
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:206 HTTP/1.1
-Host: test.remote.server.com:206
-Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.server.com:206", response="5059a96c954981ceb94e17d667c8d3f8"
+CONNECT test.remote.haxx.se:206 HTTP/1.1
+Host: test.remote.haxx.se:206
+Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="test.remote.haxx.se:206", response="676e0836f3e1c5b31bf29770ef9d8224"
 Proxy-Connection: Keep-Alive
 
 GET /path/2060002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:206
+Host: test.remote.haxx.se:206
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test209 b/tests/data/test209
index e922e789db..ef372c4de7 100644
--- a/tests/data/test209
+++ b/tests/data/test209
@@ -80,7 +80,7 @@ NTLM
 HTTP proxy CONNECT auth NTLM
  </name>
  <command>
-http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
+http://test.remote.haxx.se:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel
 </command>
 </client>
 
@@ -95,19 +95,19 @@ http://test.remote.server.com:209/path/2090002 --proxy http://%HOSTIP:%HTTPPORT
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-CONNECT test.remote.server.com:209 HTTP/1.1
-Host: test.remote.server.com:209
+CONNECT test.remote.haxx.se:209 HTTP/1.1
+Host: test.remote.haxx.se:209
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:209 HTTP/1.1
-Host: test.remote.server.com:209
+CONNECT test.remote.haxx.se:209 HTTP/1.1
+Host: test.remote.haxx.se:209
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 GET /path/2090002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:209
+Host: test.remote.haxx.se:209
 Accept: */*
 
 </protocol>
diff --git a/tests/data/test213 b/tests/data/test213
index 7766094626..801d9e7ad2 100644
--- a/tests/data/test213
+++ b/tests/data/test213
@@ -80,7 +80,7 @@ NTLM
 HTTP 1.0 proxy CONNECT auth NTLM and then POST
  </name>
  <command>
-http://test.remote.server.com:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.haxx.se:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
 </client>
 
@@ -95,19 +95,19 @@ http://test.remote.server.com:213/path/2130002 --proxy1.0 http://%HOSTIP:%HTTPPO
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol nonewline="yes">
-CONNECT test.remote.server.com:213 HTTP/1.0
-Host: test.remote.server.com:213
+CONNECT test.remote.haxx.se:213 HTTP/1.0
+Host: test.remote.haxx.se:213
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:213 HTTP/1.0
-Host: test.remote.server.com:213
+CONNECT test.remote.haxx.se:213 HTTP/1.0
+Host: test.remote.haxx.se:213
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 POST /path/2130002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:213
+Host: test.remote.haxx.se:213
 Accept: */*
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test217 b/tests/data/test217
index 13fb543818..f28800853d 100644
--- a/tests/data/test217
+++ b/tests/data/test217
@@ -32,7 +32,7 @@ http
 HTTP proxy CONNECT to proxy returning 405
  </name>
  <command>
-http://test.remote.server.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
+http://test.remote.haxx.se:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT --proxytunnel -w "%{http_code} %{http_connect}\n"
 </command>
 </client>
 
@@ -42,8 +42,8 @@ http://test.remote.server.com:217/path/2170002 --proxy http://%HOSTIP:%HTTPPORT
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-CONNECT test.remote.server.com:217 HTTP/1.1
-Host: test.remote.server.com:217
+CONNECT test.remote.haxx.se:217 HTTP/1.1
+Host: test.remote.haxx.se:217
 Proxy-Connection: Keep-Alive
 
 </protocol>
diff --git a/tests/data/test265 b/tests/data/test265
index 65db93d636..bd8a24c0a2 100644
--- a/tests/data/test265
+++ b/tests/data/test265
@@ -83,7 +83,7 @@ NTLM
 HTTP proxy CONNECT auth NTLM and then POST, response-body in the 407
  </name>
  <command>
-http://test.remote.server.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
+http://test.remote.haxx.se:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT --proxy-user silly:person --proxy-ntlm --proxytunnel -d "postit"
 </command>
 </client>
 
@@ -98,19 +98,19 @@ http://test.remote.server.com:265/path/2650002 --proxy http://%HOSTIP:%HTTPPORT
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol nonewline="yes">
-CONNECT test.remote.server.com:265 HTTP/1.1
-Host: test.remote.server.com:265
+CONNECT test.remote.haxx.se:265 HTTP/1.1
+Host: test.remote.haxx.se:265
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 Proxy-Connection: Keep-Alive
 
-CONNECT test.remote.server.com:265 HTTP/1.1
-Host: test.remote.server.com:265
+CONNECT test.remote.haxx.se:265 HTTP/1.1
+Host: test.remote.haxx.se:265
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 Proxy-Connection: Keep-Alive
 
 POST /path/2650002 HTTP/1.1
 User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6b zlib/1.1.4
-Host: test.remote.server.com:265
+Host: test.remote.haxx.se:265
 Accept: */*
 Content-Length: 6
 Content-Type: application/x-www-form-urlencoded
diff --git a/tests/data/test287 b/tests/data/test287
index 56c1b23dc5..30f5834d53 100644
--- a/tests/data/test287
+++ b/tests/data/test287
@@ -29,15 +29,15 @@ http
 HTTP proxy CONNECT with custom User-Agent header
  </name>
  <command>
-http://test.remote.server.com:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
+http://test.remote.haxx.se:287/path/287 -H "User-Agent: looser/2007" --proxy http://%HOSTIP:%HTTPPORT --proxytunnel
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
 <protocol>
-CONNECT test.remote.server.com:287 HTTP/1.1
-Host: test.remote.server.com:287
+CONNECT test.remote.haxx.se:287 HTTP/1.1
+Host: test.remote.haxx.se:287
 Proxy-Connection: Keep-Alive
 User-Agent: looser/2007
 
diff --git a/tests/data/test540 b/tests/data/test540
index e9fc07a377..7c5b9a86d0 100644
--- a/tests/data/test540
+++ b/tests/data/test540
@@ -64,7 +64,7 @@ crypto
 HTTP proxy auth Digest multi API re-using connection
  </name>
  <command>
-http://test.remote.server.com/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
+http://test.remote.haxx.se/path/540 http://%HOSTIP:%HTTPPORT silly:person custom.set.host.name
 </command>
 </client>
 
@@ -74,18 +74,18 @@ http://test.remote.server.com/path/540 http://%HOSTIP:%HTTPPORT silly:person cus
 ^User-Agent: curl/.*
 </strip>
 <protocol>
-GET http://test.remote.server.com/path/540 HTTP/1.1
+GET http://test.remote.haxx.se/path/540 HTTP/1.1
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: custom.set.host.name
 
-GET http://test.remote.server.com/path/540 HTTP/1.1
+GET http://test.remote.haxx.se/path/540 HTTP/1.1
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
 Host: custom.set.host.name
 
-GET http://test.remote.server.com/path/540 HTTP/1.1
+GET http://test.remote.haxx.se/path/540 HTTP/1.1
 Proxy-Authorization: Digest username="silly", realm="weirdorealm", nonce="12345", uri="/path/540", response="ca507dcf189196b6a5374d3233042261"
 Accept: */*
 Proxy-Connection: Keep-Alive
diff --git a/tests/data/test547 b/tests/data/test547
index 954d59845b..d2e9d9ea1b 100644
--- a/tests/data/test547
+++ b/tests/data/test547
@@ -81,7 +81,7 @@ NTLM
 HTTP proxy auth NTLM with POST data from read callback
  </name>
  <command>
-http://test.remote.server.com/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.haxx.se/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
@@ -96,28 +96,28 @@ http://test.remote.server.com/path/547 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-POST http://test.remote.server.com/path/547 HTTP/1.1
+POST http://test.remote.haxx.se/path/547 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.server.com/path/547 HTTP/1.1
+POST http://test.remote.haxx.se/path/547 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.server.com/path/547 HTTP/1.1
+POST http://test.remote.haxx.se/path/547 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test548 b/tests/data/test548
index 7dcae4c39a..215b44fd94 100644
--- a/tests/data/test548
+++ b/tests/data/test548
@@ -81,7 +81,7 @@ NTLM
 HTTP proxy auth NTLM with POST data from CURLOPT_POSTFIELDS
  </name>
  <command>
-http://test.remote.server.com/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.haxx.se/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
@@ -96,28 +96,28 @@ http://test.remote.server.com/path/548 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-POST http://test.remote.server.com/path/548 HTTP/1.1
+POST http://test.remote.haxx.se/path/548 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.server.com/path/548 HTTP/1.1
+POST http://test.remote.haxx.se/path/548 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.server.com/path/548 HTTP/1.1
+POST http://test.remote.haxx.se/path/548 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test551 b/tests/data/test551
index 48e84489f4..28b5af5a72 100644
--- a/tests/data/test551
+++ b/tests/data/test551
@@ -66,7 +66,7 @@ lib547
 HTTP proxy auth Digest with POST data from read callback
  </name>
  <command>
-http://test.remote.server.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.haxx.se/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
@@ -81,17 +81,17 @@ http://test.remote.server.com/path/551 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-POST http://test.remote.server.com/path/551 HTTP/1.1
-Host: test.remote.server.com
+POST http://test.remote.haxx.se/path/551 HTTP/1.1
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.server.com/path/551 HTTP/1.1
+POST http://test.remote.haxx.se/path/551 HTTP/1.1
 Proxy-Authorization: Digest username="s1lly", realm="something fun to read", nonce="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", uri="/path/551", response="3325240726fbdaf1e61f3a0dd40b930c"
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
diff --git a/tests/data/test552 b/tests/data/test552
index 62a61af5b0..b0db37c1ee 100644
Binary files a/tests/data/test552 and b/tests/data/test552 differ
diff --git a/tests/data/test555 b/tests/data/test555
index ecac7500ed..6a7aa1da0e 100644
--- a/tests/data/test555
+++ b/tests/data/test555
@@ -86,7 +86,7 @@ NTLM
 HTTP proxy auth NTLM with POST data from read callback multi-if
  </name>
  <command>
-http://test.remote.server.com/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
+http://test.remote.haxx.se/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 </command>
 </client>
 
@@ -101,28 +101,28 @@ http://test.remote.server.com/path/555 http://%HOSTIP:%HTTPPORT s1lly:pers0n
 s/^(Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA).*/$1/
 </strippart>
 <protocol>
-POST http://test.remote.server.com/path/555 HTTP/1.1
+POST http://test.remote.haxx.se/path/555 HTTP/1.1
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36
 Content-Type: application/x-www-form-urlencoded
 
 this is the blurb we want to upload
-POST http://test.remote.server.com/path/555 HTTP/1.1
+POST http://test.remote.haxx.se/path/555 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAABAAAABoIIAAAAAAAAAAAAAAAAAAAAAAA=
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 0
 Content-Type: application/x-www-form-urlencoded
 
-POST http://test.remote.server.com/path/555 HTTP/1.1
+POST http://test.remote.haxx.se/path/555 HTTP/1.1
 Proxy-Authorization: NTLM TlRMTVNTUAADAAAAGAAYAEAAAAAYABgAWAAAAAAAAABwAAAABQAFAHAAAAA
 User-Agent: curl/7.13.2-CVS (i686-pc-linux-gnu) libcurl/7.13.2-CVS OpenSSL/0.9.7e zlib/1.2.2 libidn/0.5.13
-Host: test.remote.server.com
+Host: test.remote.haxx.se
 Accept: */*
 Proxy-Connection: Keep-Alive
 Content-Length: 36