diff --git a/test/miscellaneous/map_context.cpp b/test/miscellaneous/map_context.cpp
index 0b465aa3c..95fbf7b9a 100644
--- a/test/miscellaneous/map_context.cpp
+++ b/test/miscellaneous/map_context.cpp
@@ -1,22 +1,24 @@
 #include "../fixtures/util.hpp"
 
-#include <mbgl/util/run_loop.hpp>
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/map_context.hpp>
 #include <mbgl/platform/default/headless_view.hpp>
 #include <mbgl/platform/default/headless_display.hpp>
 #include <mbgl/storage/default_file_source.hpp>
+#include <mbgl/util/thread.hpp>
 
 using namespace mbgl;
 
 TEST(MapContext, DoubleStyleLoad) {
-    util::RunLoop runLoop(uv_default_loop());
     std::shared_ptr<HeadlessDisplay> display = std::make_shared<HeadlessDisplay>();
     HeadlessView view(display, 512, 512, 1);
     DefaultFileSource fileSource(nullptr);
     MapData data(view, MapMode::Continuous);
-    MapContext context(uv_default_loop(), view, fileSource, data);
 
-    context.setStyleJSON("", "");
-    context.setStyleJSON("", "");
+    std::unique_ptr<util::Thread<MapContext>> context(
+        util::make_unique<util::Thread<MapContext>>(
+            "Map", util::ThreadPriority::Regular, view, fileSource, data));
+
+    context->invokeSync(&MapContext::setStyleJSON, "", "");
+    context->invokeSync(&MapContext::setStyleJSON, "", "");
 }