1 files changed, 13 insertions, 3 deletions

diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp
index c1b7f27a98..9e9d5b21a6 100644
--- a/test/storage/file_reading.cpp
+++ b/test/storage/file_reading.cpp
@@ -4,6 +4,7 @@
 
 #include <mbgl/storage/default_file_source.hpp>
 #include <mbgl/platform/platform.hpp>
+#include <mbgl/util/run_loop.hpp>
 
 TEST_F(Storage, AssetEmptyFile) {
     SCOPED_TEST(EmptyFile)
@@ -16,7 +17,9 @@ TEST_F(Storage, AssetEmptyFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
-    Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" }, uv_default_loop(),
+    util::RunLoop loop(uv_default_loop());
+
+    Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/empty" },
                [&](const Response &res) {
         fs.cancel(req);
         EXPECT_EQ(nullptr, res.error);
@@ -26,6 +29,7 @@ TEST_F(Storage, AssetEmptyFile) {
         EXPECT_EQ(0, res.expires);
         EXPECT_LT(1420000000, res.modified);
         EXPECT_NE("", res.etag);
+        loop.stop();
         EmptyFile.finish();
     });
 
@@ -43,8 +47,10 @@ TEST_F(Storage, AssetNonEmptyFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
+    util::RunLoop loop(uv_default_loop());
+
     Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/nonempty" },
-               uv_default_loop(), [&](const Response &res) {
+               [&](const Response &res) {
         fs.cancel(req);
         EXPECT_EQ(nullptr, res.error);
         EXPECT_EQ(false, res.stale);
@@ -55,6 +61,7 @@ TEST_F(Storage, AssetNonEmptyFile) {
         EXPECT_NE("", res.etag);
         ASSERT_TRUE(res.data.get());
         EXPECT_EQ("content is here\n", *res.data);
+        loop.stop();
         NonEmptyFile.finish();
     });
 
@@ -72,8 +79,10 @@ TEST_F(Storage, AssetNonExistentFile) {
     DefaultFileSource fs(nullptr);
 #endif
 
+    util::RunLoop loop(uv_default_loop());
+
     Request* req = fs.request({ Resource::Unknown, "asset://TEST_DATA/fixtures/storage/does_not_exist" },
-               uv_default_loop(), [&](const Response &res) {
+               [&](const Response &res) {
         fs.cancel(req);
         ASSERT_NE(nullptr, res.error);
         EXPECT_EQ(Response::Error::Reason::NotFound, res.error->reason);
@@ -87,6 +96,7 @@ TEST_F(Storage, AssetNonExistentFile) {
 #elif MBGL_ASSET_FS
         EXPECT_EQ("no such file or directory", res.error->message);
 #endif
+        loop.stop();
         NonExistentFile.finish();
     });