diff --git a/test/miscellaneous/binpack.cpp b/test/geometry/binpack.cpp
similarity index 100%
rename from test/miscellaneous/binpack.cpp
rename to test/geometry/binpack.cpp
diff --git a/test/miscellaneous/map.cpp b/test/map/map.cpp
similarity index 100%
rename from test/miscellaneous/map.cpp
rename to test/map/map.cpp
diff --git a/test/miscellaneous/map_context.cpp b/test/map/map_context.cpp
similarity index 100%
rename from test/miscellaneous/map_context.cpp
rename to test/map/map_context.cpp
diff --git a/test/miscellaneous/tile.cpp b/test/map/tile.cpp
similarity index 100%
rename from test/miscellaneous/tile.cpp
rename to test/map/tile.cpp
diff --git a/test/miscellaneous/transform.cpp b/test/map/transform.cpp
similarity index 100%
rename from test/miscellaneous/transform.cpp
rename to test/map/transform.cpp
diff --git a/test/miscellaneous/comparisons.cpp b/test/style/comparisons.cpp
similarity index 100%
rename from test/miscellaneous/comparisons.cpp
rename to test/style/comparisons.cpp
diff --git a/test/miscellaneous/functions.cpp b/test/style/functions.cpp
similarity index 100%
rename from test/miscellaneous/functions.cpp
rename to test/style/functions.cpp
diff --git a/test/miscellaneous/style_parser.cpp b/test/style/style_parser.cpp
similarity index 100%
rename from test/miscellaneous/style_parser.cpp
rename to test/style/style_parser.cpp
diff --git a/test/miscellaneous/variant.cpp b/test/style/variant.cpp
similarity index 100%
rename from test/miscellaneous/variant.cpp
rename to test/style/variant.cpp
diff --git a/test/test.gypi b/test/test.gypi
index 93613cebf..8246c952b 100644
--- a/test/test.gypi
+++ b/test/test.gypi
@@ -36,7 +36,20 @@
         'fixtures/fixture_log_observer.hpp',
         'fixtures/fixture_log_observer.cpp',
 
-        'miscellaneous/assert.cpp',
+        'util/assert.cpp',
+        'util/async_task.cpp',
+        'util/clip_ids.cpp',
+        'util/geo.cpp',
+        'util/image.cpp',
+        'util/mapbox.cpp',
+        'util/merge_lines.cpp',
+        'util/run_loop.cpp',
+        'util/text_conversions.cpp',
+        'util/thread.cpp',
+        'util/thread_local.cpp',
+        'util/timer.cpp',
+        'util/token.cpp',
+        'util/work_queue.cpp',
 
         'api/annotations.cpp',
         'api/api_misuse.cpp',
@@ -45,28 +58,12 @@
         'api/set_style.cpp',
         'api/custom_layer.cpp',
 
-        'miscellaneous/async_task.cpp',
-        'miscellaneous/clip_ids.cpp',
-        'miscellaneous/binpack.cpp',
-        'miscellaneous/comparisons.cpp',
-        'miscellaneous/functions.cpp',
-        'miscellaneous/geo.cpp',
-        'miscellaneous/image.cpp',
-        'miscellaneous/map.cpp',
-        'miscellaneous/map_context.cpp',
-        'miscellaneous/mapbox.cpp',
-        'miscellaneous/merge_lines.cpp',
-        'miscellaneous/style_parser.cpp',
-        'miscellaneous/run_loop.cpp',
-        'miscellaneous/text_conversions.cpp',
-        'miscellaneous/thread.cpp',
-        'miscellaneous/thread_local.cpp',
-        'miscellaneous/tile.cpp',
-        'miscellaneous/timer.cpp',
-        'miscellaneous/token.cpp',
-        'miscellaneous/transform.cpp',
-        'miscellaneous/work_queue.cpp',
-        'miscellaneous/variant.cpp',
+        'geometry/binpack.cpp',
+
+        'map/map.cpp',
+        'map/map_context.cpp',
+        'map/tile.cpp',
+        'map/transform.cpp',
 
         'storage/storage.hpp',
         'storage/storage.cpp',
@@ -93,6 +90,10 @@
         'style/source.cpp',
         'style/style.cpp',
         'style/style_layer.cpp',
+        'style/comparisons.cpp',
+        'style/functions.cpp',
+        'style/style_parser.cpp',
+        'style/variant.cpp',
 
         'sprite/sprite_atlas.cpp',
         'sprite/sprite_image.cpp',
diff --git a/test/miscellaneous/assert.cpp b/test/util/assert.cpp
similarity index 100%
rename from test/miscellaneous/assert.cpp
rename to test/util/assert.cpp
diff --git a/test/miscellaneous/async_task.cpp b/test/util/async_task.cpp
similarity index 100%
rename from test/miscellaneous/async_task.cpp
rename to test/util/async_task.cpp
diff --git a/test/miscellaneous/clip_ids.cpp b/test/util/clip_ids.cpp
similarity index 100%
rename from test/miscellaneous/clip_ids.cpp
rename to test/util/clip_ids.cpp
diff --git a/test/miscellaneous/geo.cpp b/test/util/geo.cpp
similarity index 100%
rename from test/miscellaneous/geo.cpp
rename to test/util/geo.cpp
diff --git a/test/miscellaneous/image.cpp b/test/util/image.cpp
similarity index 100%
rename from test/miscellaneous/image.cpp
rename to test/util/image.cpp
diff --git a/test/miscellaneous/mapbox.cpp b/test/util/mapbox.cpp
similarity index 100%
rename from test/miscellaneous/mapbox.cpp
rename to test/util/mapbox.cpp
diff --git a/test/miscellaneous/merge_lines.cpp b/test/util/merge_lines.cpp
similarity index 100%
rename from test/miscellaneous/merge_lines.cpp
rename to test/util/merge_lines.cpp
diff --git a/test/miscellaneous/run_loop.cpp b/test/util/run_loop.cpp
similarity index 100%
rename from test/miscellaneous/run_loop.cpp
rename to test/util/run_loop.cpp
diff --git a/test/miscellaneous/text_conversions.cpp b/test/util/text_conversions.cpp
similarity index 100%
rename from test/miscellaneous/text_conversions.cpp
rename to test/util/text_conversions.cpp
diff --git a/test/miscellaneous/thread.cpp b/test/util/thread.cpp
similarity index 100%
rename from test/miscellaneous/thread.cpp
rename to test/util/thread.cpp
diff --git a/test/miscellaneous/thread_local.cpp b/test/util/thread_local.cpp
similarity index 100%
rename from test/miscellaneous/thread_local.cpp
rename to test/util/thread_local.cpp
diff --git a/test/miscellaneous/timer.cpp b/test/util/timer.cpp
similarity index 100%
rename from test/miscellaneous/timer.cpp
rename to test/util/timer.cpp
diff --git a/test/miscellaneous/token.cpp b/test/util/token.cpp
similarity index 100%
rename from test/miscellaneous/token.cpp
rename to test/util/token.cpp
diff --git a/test/miscellaneous/work_queue.cpp b/test/util/work_queue.cpp
similarity index 100%
rename from test/miscellaneous/work_queue.cpp
rename to test/util/work_queue.cpp