diff --git a/test/style/mock_file_source.cpp b/test/fixtures/mock_file_source.cpp
similarity index 100%
rename from test/style/mock_file_source.cpp
rename to test/fixtures/mock_file_source.cpp
diff --git a/test/style/mock_file_source.hpp b/test/fixtures/mock_file_source.hpp
similarity index 100%
rename from test/style/mock_file_source.hpp
rename to test/fixtures/mock_file_source.hpp
diff --git a/test/style/pending_resources.cpp b/test/style/pending_resources.cpp
index 8eea81191..4513d1864 100644
--- a/test/style/pending_resources.cpp
+++ b/test/style/pending_resources.cpp
@@ -1,6 +1,6 @@
 #include "../fixtures/fixture_log_observer.hpp"
+#include "../fixtures/mock_file_source.hpp"
 #include "../fixtures/util.hpp"
-#include "mock_file_source.hpp"
 
 #include <mbgl/map/map.hpp>
 #include <mbgl/map/still_image.hpp>
diff --git a/test/style/resource_loading.cpp b/test/style/resource_loading.cpp
index a295294f5..025b9b027 100644
--- a/test/style/resource_loading.cpp
+++ b/test/style/resource_loading.cpp
@@ -1,7 +1,7 @@
 #include "../fixtures/fixture_log_observer.hpp"
 #include "../fixtures/util.hpp"
+#include "../fixtures/mock_file_source.hpp"
 #include "../fixtures/mock_view.hpp"
-#include "mock_file_source.hpp"
 
 #include <mbgl/map/map_data.hpp>
 #include <mbgl/map/transform.hpp>
diff --git a/test/style/sprite.cpp b/test/style/sprite.cpp
index 41ded0afe..1c3f9b227 100644
--- a/test/style/sprite.cpp
+++ b/test/style/sprite.cpp
@@ -1,6 +1,6 @@
 #include "../fixtures/fixture_log_observer.hpp"
+#include "../fixtures/mock_file_source.hpp"
 #include "../fixtures/util.hpp"
-#include "mock_file_source.hpp"
 
 #include <mbgl/map/sprite.hpp>
 #include <mbgl/util/run_loop.hpp>
diff --git a/test/test.gypi b/test/test.gypi
index c32b02746..ece68fcc8 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -30,6 +30,9 @@
       ],
       'sources': [
         'fixtures/main.cpp',
+        'fixtures/mock_file_source.cpp',
+        'fixtures/mock_file_source.hpp',
+        'fixtures/mock_view.hpp',
         'fixtures/util.hpp',
         'fixtures/util.cpp',
         'fixtures/fixture_log_observer.hpp',
@@ -83,9 +86,6 @@
         'storage/http_other_loop.cpp',
         'storage/http_reading.cpp',
 
-        'style/mock_file_source.cpp',
-        'style/mock_file_source.hpp',
-        'style/mock_view.hpp',
         'style/pending_resources.cpp',
         'style/resource_loading.cpp',
         'style/sprite.cpp',