diff --git a/tests/tungsten.rs b/tests/tungsten.rs
index dc43a17..615ed0c 100644
--- a/tests/tungsten.rs
+++ b/tests/tungsten.rs
@@ -2,34 +2,63 @@ extern crate hyper;
 extern crate tungsten;
 
 use std::thread;
+use std::sync::{Once, ONCE_INIT};
 use std::io::Read;
 use hyper::status::StatusCode;
 use hyper::client::Client;
+use hyper::client::response::Response as HyperResponse;
 use tungsten::server::Tungsten;
 use tungsten::request::Request;
 use tungsten::response::Response;
 use tungsten::router::HttpMethods;
 
-fn serve() {
-  let _ = thread::Builder::new().name(String::from("test-server")).spawn(move || {
-    let mut app = Tungsten::new();
-    app.get("/".to_string(), |req: Request, res: Response| {
-        res.send(b"Hello World!");
-    });
-    app.get("/some/random/path".to_string(), |req: Request, res: Response| {
-        res.send(b"You are at /some/random/path");
-    });
-    app.listen("0.0.0.0:4040");
-  });
+static TEST_INIT: Once = ONCE_INIT;
+
+struct TestContext {
+    req_client: Client
+}
+
+impl TestContext {
+    fn new() ->  TestContext {
+        let ctx = TestContext {
+            req_client: Client::new()
+        };
+        TEST_INIT.call_once(|| {
+            let _ = thread::spawn(move || {
+                let mut app = Tungsten::new();
+                app.get("/".to_string(), |req: Request, res: Response| {
+                    res.send(b"Hello World!");
+                });
+                app.get("/some/random/path".to_string(), |req: Request, res: Response| {
+                    res.send(b"You are at /some/random/path");
+                });
+                app.listen("0.0.0.0:4040");
+            });
+            loop {
+                if ctx.req_client.get("http://0.0.0.0:4040").send().is_ok() {
+                    break;
+                }
+            }
+        });
+        ctx
+    }
+
+    fn request(&self, url: &str) -> HyperResponse {
+        self.req_client.get(url).send().unwrap()
+    }
+
+    fn body_from_response(&self, res: &mut HyperResponse) -> String {
+        let mut body = String::new();
+        let _ = res.read_to_string(&mut body);
+        body
+    }
 }
 
 #[test]
 fn test_hello_world() {
-    serve();
-    let client = Client::new();
-    let mut res = client.get("http://0.0.0.0:4040").send().unwrap();
-    let mut body = String::new();
-    let _ = res.read_to_string(&mut body);
+    let ctx = TestContext::new();
+    let mut res = ctx.request("http://0.0.0.0:4040");
+    let body = ctx.body_from_response(&mut res);
 
     assert_eq!(res.status, StatusCode::Ok);
     assert_eq!(body, "Hello World!");
@@ -37,10 +66,9 @@ fn test_hello_world() {
 
 #[test]
 fn test_some_path() {
-    let client = Client::new();
-    let mut res = client.get("http://0.0.0.0:4040/some/random/path").send().unwrap();
-    let mut body = String::new();
-    let _ = res.read_to_string(&mut body);
+    let ctx = TestContext::new();
+    let mut res = ctx.request("http://0.0.0.0:4040/some/random/path");
+    let body = ctx.body_from_response(&mut res);
 
     assert_eq!(res.status, StatusCode::Ok);
     assert_eq!(body, "You are at /some/random/path");