1 files changed, 7 insertions, 5 deletions
diff --git a/test/storage/file_reading.cpp b/test/storage/file_reading.cpp
index 273b58218e..93c119d44f 100644
--- a/test/storage/file_reading.cpp
+++ b/test/storage/file_reading.cpp
@@ -1,17 +1,18 @@
-#include "../util.hpp"
+#include "storage.hpp"
 
 #include <uv.h>
 
 #include <mbgl/storage/default/default_file_source.hpp>
 
-TEST(Storage, EmptyFile) {
+TEST_F(Storage, EmptyFile) {
     SCOPED_TEST(EmptyFile)
 
     using namespace mbgl;
 
     DefaultFileSource fs(nullptr, uv_default_loop());
 
-    fs.request({ Resource::Unknown, "asset://test/fixtures/storage/empty" }, uv_default_loop(), [&](const Response &res) {
+    const auto file = std::string { "asset://" } + mbgl::test::getBaseDirectory() + "/fixtures/storage/empty";
+    fs.request({ Resource::Unknown, file }, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(res.status, Response::Successful);
         EXPECT_EQ(res.data.size(), 0ul);
         EXPECT_EQ(res.expires, 0);
@@ -24,14 +25,15 @@ TEST(Storage, EmptyFile) {
     uv_run(uv_default_loop(), UV_RUN_DEFAULT);
 }
 
-TEST(Storage, NonExistentFile) {
+TEST_F(Storage, NonExistentFile) {
     SCOPED_TEST(NonExistentFile)
 
     using namespace mbgl;
 
     DefaultFileSource fs(nullptr, uv_default_loop());
 
-    fs.request({ Resource::Unknown, "asset://test/fixtures/storage/does_not_exist" }, uv_default_loop(), [&](const Response &res) {
+    const auto file = std::string { "asset://" } + mbgl::test::getBaseDirectory() + "/fixtures/storage/does_not_exist";
+    fs.request({ Resource::Unknown, file }, uv_default_loop(), [&](const Response &res) {
         EXPECT_EQ(res.status, Response::Error);
         EXPECT_EQ(res.data.size(), 0ul);
         EXPECT_EQ(res.expires, 0);