1 files changed, 7 insertions, 2 deletions
diff --git a/test/src/mbgl/test/test.cpp b/test/src/mbgl/test/test.cpp
index 4c3dad1727..94e3d47ac7 100644
--- a/test/src/mbgl/test/test.cpp
+++ b/test/src/mbgl/test/test.cpp
@@ -1,13 +1,18 @@
 #include <mbgl/test.hpp>
 #include <mbgl/test/util.hpp>
-
+#include <mbgl/util/thread.hpp>
 #include <gtest/gtest.h>
 
 namespace mbgl {
 
 int runTests(int argc, char *argv[]) {
 #if TEST_HAS_SERVER
-    auto server = std::make_unique<test::Server>("test/storage/server.js");
+    std::cout << "Starting server\n";
+    util::Thread<test::Server> server({"Webserver"});
+    server.invokeSync(&test::Server::start);
+
+    //Sleep so we know the server actually started
+    usleep(5 * 1000 * 1000);
 #endif
 
     testing::InitGoogleTest(&argc, argv);