diff --git a/test/include/mbgl/test/vector_tile_test.hpp b/test/include/mbgl/test/vector_tile_test.hpp
index ddb82544078..3a28689a1a0 100644
--- a/test/include/mbgl/test/vector_tile_test.hpp
+++ b/test/include/mbgl/test/vector_tile_test.hpp
@@ -27,7 +27,7 @@ class VectorTileTest {
 
     Tileset tileset{{"https://example.com"}, {0, 22}, "none"};
 
-    const std::shared_ptr<Scheduler> threadPool = Scheduler::GetBackground();
+    TaggedScheduler threadPool;
 
     TileParameters tileParameters{1.0,
                                   MapDebugOptions(),
@@ -39,10 +39,12 @@ class VectorTileTest {
                                   glyphManager,
                                   0};
 
+    VectorTileTest() : threadPool(Scheduler::GetBackground(), this) {}
+
     ~VectorTileTest() {
         // Ensure that deferred releases are complete before cleaning up
         loop.waitForEmpty();
-        threadPool->waitForEmpty();
+        threadPool.waitForEmpty();
     }
 };
 
diff --git a/test/tile/tile_cache.test.cpp b/test/tile/tile_cache.test.cpp
index 51c0c92ef8f..825ce087ae0 100644
--- a/test/tile/tile_cache.test.cpp
+++ b/test/tile/tile_cache.test.cpp
@@ -45,7 +45,8 @@ class VectorTileMock : public VectorTile {
 
 TEST(TileCache, Smoke) {
     VectorTileTest test;
-    TileCache cache(Scheduler::GetBackground(), 1);
+    TaggedScheduler scheduler(Scheduler::GetBackground(), &test);
+    TileCache cache(scheduler, 1);
     const OverscaledTileID id(0, 0, 0);
     auto tile = std::make_unique<VectorTileMock>(id, "source", test.tileParameters, test.tileset);