diff --git a/libs/network/test/http/client_get_timeout_test.cpp b/libs/network/test/http/client_get_timeout_test.cpp
index 9eb0103b9..9672fde54 100644
--- a/libs/network/test/http/client_get_timeout_test.cpp
+++ b/libs/network/test/http/client_get_timeout_test.cpp
@@ -8,8 +8,23 @@
 #include <boost/network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
 #include "client_types.hpp"
+#include "http_test_server.hpp"
 
-namespace http = boost::network::http;
+struct localhost_server_fixture {
+  localhost_server_fixture() {
+    if (!server.start())
+      std::cout << "Failed to start HTTP server for test!" << std::endl;
+  }
+
+  ~localhost_server_fixture() {
+    if (!server.stop())
+      std::cout << "Failed to stop HTTP server for test!" << std::endl;
+  }
+
+  http_test_server server;
+};
+
+BOOST_GLOBAL_FIXTURE(localhost_server_fixture);
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_0, client, client_types) {
   typename client::request request("http://localhost:12121/");
@@ -22,11 +37,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_1_0, client, client_types) {
                     , std::exception);
 }
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client,
-                              client_types) {
-  typename client::request request(
-      "http://cznic.dl.sourceforge.net/project/boost/boost/1.55.0/"
-      "boost_1_55_0.tar.bz2");
+BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client, client_types) {
+  typename client::request request("http://localhost:8000/cgi-bin/sleep.py?3");
   typename client::response response;
   typename client::options options;
   client client_(options.timeout(1));
@@ -37,10 +49,8 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(http_get_test_timeout_with_options, client,
 
 #ifdef BOOST_NETWORK_ENABLE_HTTPS
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(https_get_test_timeout_with_options, client,
-                              client_types) {
-  typename client::request request(
-      "https://www.kernel.org/pub/linux/kernel/v3.x/linux-3.8.2.tar.bz2");
+BOOST_AUTO_TEST_CASE_TEMPLATE(https_get_test_timeout_with_options, client, client_types) {
+  typename client::request request("https://localhost:8000/cgi-bin/sleep.py?3");
   typename client::response response;
   typename client::options options;
   client client_(options.timeout(1));
diff --git a/libs/network/test/http/http_test_server.hpp b/libs/network/test/http/http_test_server.hpp
index 8070a8d02..1438165a2 100644
--- a/libs/network/test/http/http_test_server.hpp
+++ b/libs/network/test/http/http_test_server.hpp
@@ -68,13 +68,20 @@ struct http_test_server {
 
     // if executed from $CPP_NETLIB_HOME
     path server_path = base_path / "libs/network/test/server" / script_name;
-    if (!exists(server_path)) {
-      // if executed from $CPP_NETLIB_HOME/libs/network/test
-      server_path = base_path / "server" / script_name;
-      if (!exists(server_path)) return path();
-    }
+    if (exists(server_path))
+      return server_path;
+
+    // if executed from $CPP_NETLIB_HOME/libs/network/test
+    server_path = base_path / "server" / script_name;
+    if (exists(server_path))
+      return server_path;
+
+    // if executed from $CPP_NETLIB_HOME/libs/network/test/*
+    server_path = base_path / "../server" / script_name;
+    if (exists(server_path))
+      return server_path;
 
-    return server_path;
+    return path();
   }
 
   script_handle_t launch_python_script(
diff --git a/libs/network/test/server/cgi-bin/sleep.py b/libs/network/test/server/cgi-bin/sleep.py
new file mode 100755
index 000000000..046fa5da2
--- /dev/null
+++ b/libs/network/test/server/cgi-bin/sleep.py
@@ -0,0 +1,8 @@
+#!/usr/bin/python
+import os, sys, time
+
+if os.environ.has_key("QUERY_STRING") and os.environ["QUERY_STRING"].isdigit():
+    time.sleep(int(os.environ["QUERY_STRING"]))
+
+sys.stdout.write( "HTTP/1.0 200\r\n" )
+sys.stdout.write( "\r\n" )