diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake
index e376bf098..f460758a0 100644
--- a/cmake/test-files.cmake
+++ b/cmake/test-files.cmake
@@ -2,44 +2,44 @@
 
 set(MBGL_TEST_FILES
     # actor
-    test/actor/actor.cpp
-    test/actor/actor_ref.cpp
+    test/actor/actor.test.cpp
+    test/actor/actor_ref.test.cpp
 
     # algorithm
-    test/algorithm/covered_by_children.cpp
-    test/algorithm/generate_clip_ids.cpp
+    test/algorithm/covered_by_children.test.cpp
+    test/algorithm/generate_clip_ids.test.cpp
     test/algorithm/mock.hpp
-    test/algorithm/update_renderables.cpp
+    test/algorithm/update_renderables.test.cpp
 
     # api
-    test/api/annotations.cpp
-    test/api/api_misuse.cpp
-    test/api/custom_layer.cpp
-    test/api/render_missing.cpp
-    test/api/repeated_render.cpp
+    test/api/annotations.test.cpp
+    test/api/api_misuse.test.cpp
+    test/api/custom_layer.test.cpp
+    test/api/render_missing.test.cpp
+    test/api/repeated_render.test.cpp
 
     # geometry
-    test/geometry/binpack.cpp
+    test/geometry/binpack.test.cpp
 
     # gl
-    test/gl/object.cpp
+    test/gl/object.test.cpp
 
     # include/mbgl
     test/include/mbgl/test.hpp
 
     # map
-    test/map/map.cpp
-    test/map/transform.cpp
+    test/map/map.test.cpp
+    test/map/transform.test.cpp
 
     # math
-    test/math/clamp.cpp
-    test/math/minmax.cpp
-    test/math/wrap.cpp
+    test/math/clamp.test.cpp
+    test/math/minmax.test.cpp
+    test/math/wrap.test.cpp
 
     # sprite
-    test/sprite/sprite_atlas.cpp
-    test/sprite/sprite_image.cpp
-    test/sprite/sprite_parser.cpp
+    test/sprite/sprite_atlas.test.cpp
+    test/sprite/sprite_image.test.cpp
+    test/sprite/sprite_parser.test.cpp
 
     # src
     test/src/main.cpp
@@ -58,53 +58,53 @@ set(MBGL_TEST_FILES
     test/src/mbgl/test/util.hpp
 
     # storage
-    test/storage/asset_file_source.cpp
-    test/storage/default_file_source.cpp
-    test/storage/headers.cpp
-    test/storage/http_file_source.cpp
-    test/storage/offline.cpp
-    test/storage/offline_database.cpp
-    test/storage/offline_download.cpp
-    test/storage/online_file_source.cpp
-    test/storage/resource.cpp
+    test/storage/asset_file_source.test.cpp
+    test/storage/default_file_source.test.cpp
+    test/storage/headers.test.cpp
+    test/storage/http_file_source.test.cpp
+    test/storage/offline.test.cpp
+    test/storage/offline_database.test.cpp
+    test/storage/offline_download.test.cpp
+    test/storage/online_file_source.test.cpp
+    test/storage/resource.test.cpp
 
     # style/conversion
-    test/style/conversion/geojson_options.cpp
+    test/style/conversion/geojson_options.test.cpp
 
     # style
-    test/style/filter.cpp
-    test/style/functions.cpp
-    test/style/source.cpp
-    test/style/style.cpp
-    test/style/style_layer.cpp
-    test/style/style_parser.cpp
-    test/style/tile_source.cpp
+    test/style/filter.test.cpp
+    test/style/functions.test.cpp
+    test/style/source.test.cpp
+    test/style/style.test.cpp
+    test/style/style_layer.test.cpp
+    test/style/style_parser.test.cpp
+    test/style/tile_source.test.cpp
 
     # text
-    test/text/glyph_atlas.cpp
-    test/text/quads.cpp
+    test/text/glyph_atlas.test.cpp
+    test/text/quads.test.cpp
 
     # tile
-    test/tile/geometry_tile_data.cpp
-    test/tile/tile_id.cpp
+    test/tile/geometry_tile_data.test.cpp
+    test/tile/tile_id.test.cpp
 
     # util
-    test/util/async_task.cpp
-    test/util/geo.cpp
-    test/util/http_timeout.cpp
-    test/util/image.cpp
-    test/util/mapbox.cpp
-    test/util/memory.cpp
-    test/util/merge_lines.cpp
-    test/util/number_conversions.cpp
-    test/util/offscreen_texture.cpp
-    test/util/projection.cpp
-    test/util/run_loop.cpp
-    test/util/text_conversions.cpp
-    test/util/thread.cpp
-    test/util/thread_local.cpp
-    test/util/tile_cover.cpp
-    test/util/timer.cpp
-    test/util/token.cpp
-    test/util/work_queue.cpp
+    test/util/async_task.test.cpp
+    test/util/geo.test.cpp
+    test/util/http_timeout.test.cpp
+    test/util/image.test.cpp
+    test/util/mapbox.test.cpp
+    test/util/memory.test.cpp
+    test/util/merge_lines.test.cpp
+    test/util/number_conversions.test.cpp
+    test/util/offscreen_texture.test.cpp
+    test/util/projection.test.cpp
+    test/util/run_loop.test.cpp
+    test/util/text_conversions.test.cpp
+    test/util/thread.test.cpp
+    test/util/thread_local.test.cpp
+    test/util/tile_cover.test.cpp
+    test/util/timer.test.cpp
+    test/util/token.test.cpp
+    test/util/work_queue.test.cpp
 )
diff --git a/test/actor/actor.cpp b/test/actor/actor.test.cpp
similarity index 100%
rename from test/actor/actor.cpp
rename to test/actor/actor.test.cpp
diff --git a/test/actor/actor_ref.cpp b/test/actor/actor_ref.test.cpp
similarity index 100%
rename from test/actor/actor_ref.cpp
rename to test/actor/actor_ref.test.cpp
diff --git a/test/algorithm/covered_by_children.cpp b/test/algorithm/covered_by_children.test.cpp
similarity index 100%
rename from test/algorithm/covered_by_children.cpp
rename to test/algorithm/covered_by_children.test.cpp
diff --git a/test/algorithm/generate_clip_ids.cpp b/test/algorithm/generate_clip_ids.test.cpp
similarity index 100%
rename from test/algorithm/generate_clip_ids.cpp
rename to test/algorithm/generate_clip_ids.test.cpp
diff --git a/test/algorithm/update_renderables.cpp b/test/algorithm/update_renderables.test.cpp
similarity index 100%
rename from test/algorithm/update_renderables.cpp
rename to test/algorithm/update_renderables.test.cpp
diff --git a/test/api/annotations.cpp b/test/api/annotations.test.cpp
similarity index 100%
rename from test/api/annotations.cpp
rename to test/api/annotations.test.cpp
diff --git a/test/api/api_misuse.cpp b/test/api/api_misuse.test.cpp
similarity index 100%
rename from test/api/api_misuse.cpp
rename to test/api/api_misuse.test.cpp
diff --git a/test/api/custom_layer.cpp b/test/api/custom_layer.test.cpp
similarity index 100%
rename from test/api/custom_layer.cpp
rename to test/api/custom_layer.test.cpp
diff --git a/test/api/render_missing.cpp b/test/api/render_missing.test.cpp
similarity index 100%
rename from test/api/render_missing.cpp
rename to test/api/render_missing.test.cpp
diff --git a/test/api/repeated_render.cpp b/test/api/repeated_render.test.cpp
similarity index 100%
rename from test/api/repeated_render.cpp
rename to test/api/repeated_render.test.cpp
diff --git a/test/geometry/binpack.cpp b/test/geometry/binpack.test.cpp
similarity index 100%
rename from test/geometry/binpack.cpp
rename to test/geometry/binpack.test.cpp
diff --git a/test/gl/object.cpp b/test/gl/object.test.cpp
similarity index 100%
rename from test/gl/object.cpp
rename to test/gl/object.test.cpp
diff --git a/test/map/map.cpp b/test/map/map.test.cpp
similarity index 100%
rename from test/map/map.cpp
rename to test/map/map.test.cpp
diff --git a/test/map/transform.cpp b/test/map/transform.test.cpp
similarity index 100%
rename from test/map/transform.cpp
rename to test/map/transform.test.cpp
diff --git a/test/math/clamp.cpp b/test/math/clamp.test.cpp
similarity index 100%
rename from test/math/clamp.cpp
rename to test/math/clamp.test.cpp
diff --git a/test/math/minmax.cpp b/test/math/minmax.test.cpp
similarity index 100%
rename from test/math/minmax.cpp
rename to test/math/minmax.test.cpp
diff --git a/test/math/wrap.cpp b/test/math/wrap.test.cpp
similarity index 100%
rename from test/math/wrap.cpp
rename to test/math/wrap.test.cpp
diff --git a/test/sprite/sprite_atlas.cpp b/test/sprite/sprite_atlas.test.cpp
similarity index 100%
rename from test/sprite/sprite_atlas.cpp
rename to test/sprite/sprite_atlas.test.cpp
diff --git a/test/sprite/sprite_image.cpp b/test/sprite/sprite_image.test.cpp
similarity index 100%
rename from test/sprite/sprite_image.cpp
rename to test/sprite/sprite_image.test.cpp
diff --git a/test/sprite/sprite_parser.cpp b/test/sprite/sprite_parser.test.cpp
similarity index 100%
rename from test/sprite/sprite_parser.cpp
rename to test/sprite/sprite_parser.test.cpp
diff --git a/test/storage/asset_file_source.cpp b/test/storage/asset_file_source.test.cpp
similarity index 100%
rename from test/storage/asset_file_source.cpp
rename to test/storage/asset_file_source.test.cpp
diff --git a/test/storage/default_file_source.cpp b/test/storage/default_file_source.test.cpp
similarity index 100%
rename from test/storage/default_file_source.cpp
rename to test/storage/default_file_source.test.cpp
diff --git a/test/storage/headers.cpp b/test/storage/headers.test.cpp
similarity index 100%
rename from test/storage/headers.cpp
rename to test/storage/headers.test.cpp
diff --git a/test/storage/http_file_source.cpp b/test/storage/http_file_source.test.cpp
similarity index 100%
rename from test/storage/http_file_source.cpp
rename to test/storage/http_file_source.test.cpp
diff --git a/test/storage/offline.cpp b/test/storage/offline.test.cpp
similarity index 100%
rename from test/storage/offline.cpp
rename to test/storage/offline.test.cpp
diff --git a/test/storage/offline_database.cpp b/test/storage/offline_database.test.cpp
similarity index 100%
rename from test/storage/offline_database.cpp
rename to test/storage/offline_database.test.cpp
diff --git a/test/storage/offline_download.cpp b/test/storage/offline_download.test.cpp
similarity index 100%
rename from test/storage/offline_download.cpp
rename to test/storage/offline_download.test.cpp
diff --git a/test/storage/online_file_source.cpp b/test/storage/online_file_source.test.cpp
similarity index 100%
rename from test/storage/online_file_source.cpp
rename to test/storage/online_file_source.test.cpp
diff --git a/test/storage/resource.cpp b/test/storage/resource.test.cpp
similarity index 100%
rename from test/storage/resource.cpp
rename to test/storage/resource.test.cpp
diff --git a/test/style/conversion/geojson_options.cpp b/test/style/conversion/geojson_options.test.cpp
similarity index 100%
rename from test/style/conversion/geojson_options.cpp
rename to test/style/conversion/geojson_options.test.cpp
diff --git a/test/style/filter.cpp b/test/style/filter.test.cpp
similarity index 100%
rename from test/style/filter.cpp
rename to test/style/filter.test.cpp
diff --git a/test/style/functions.cpp b/test/style/functions.test.cpp
similarity index 100%
rename from test/style/functions.cpp
rename to test/style/functions.test.cpp
diff --git a/test/style/source.cpp b/test/style/source.test.cpp
similarity index 100%
rename from test/style/source.cpp
rename to test/style/source.test.cpp
diff --git a/test/style/style.cpp b/test/style/style.test.cpp
similarity index 100%
rename from test/style/style.cpp
rename to test/style/style.test.cpp
diff --git a/test/style/style_layer.cpp b/test/style/style_layer.test.cpp
similarity index 100%
rename from test/style/style_layer.cpp
rename to test/style/style_layer.test.cpp
diff --git a/test/style/style_parser.cpp b/test/style/style_parser.test.cpp
similarity index 100%
rename from test/style/style_parser.cpp
rename to test/style/style_parser.test.cpp
diff --git a/test/style/tile_source.cpp b/test/style/tile_source.test.cpp
similarity index 100%
rename from test/style/tile_source.cpp
rename to test/style/tile_source.test.cpp
diff --git a/test/text/glyph_atlas.cpp b/test/text/glyph_atlas.test.cpp
similarity index 100%
rename from test/text/glyph_atlas.cpp
rename to test/text/glyph_atlas.test.cpp
diff --git a/test/text/quads.cpp b/test/text/quads.test.cpp
similarity index 100%
rename from test/text/quads.cpp
rename to test/text/quads.test.cpp
diff --git a/test/tile/geometry_tile_data.cpp b/test/tile/geometry_tile_data.test.cpp
similarity index 100%
rename from test/tile/geometry_tile_data.cpp
rename to test/tile/geometry_tile_data.test.cpp
diff --git a/test/tile/tile_id.cpp b/test/tile/tile_id.test.cpp
similarity index 100%
rename from test/tile/tile_id.cpp
rename to test/tile/tile_id.test.cpp
diff --git a/test/util/async_task.cpp b/test/util/async_task.test.cpp
similarity index 100%
rename from test/util/async_task.cpp
rename to test/util/async_task.test.cpp
diff --git a/test/util/geo.cpp b/test/util/geo.test.cpp
similarity index 100%
rename from test/util/geo.cpp
rename to test/util/geo.test.cpp
diff --git a/test/util/http_timeout.cpp b/test/util/http_timeout.test.cpp
similarity index 100%
rename from test/util/http_timeout.cpp
rename to test/util/http_timeout.test.cpp
diff --git a/test/util/image.cpp b/test/util/image.test.cpp
similarity index 100%
rename from test/util/image.cpp
rename to test/util/image.test.cpp
diff --git a/test/util/mapbox.cpp b/test/util/mapbox.test.cpp
similarity index 100%
rename from test/util/mapbox.cpp
rename to test/util/mapbox.test.cpp
diff --git a/test/util/memory.cpp b/test/util/memory.test.cpp
similarity index 100%
rename from test/util/memory.cpp
rename to test/util/memory.test.cpp
diff --git a/test/util/merge_lines.cpp b/test/util/merge_lines.test.cpp
similarity index 100%
rename from test/util/merge_lines.cpp
rename to test/util/merge_lines.test.cpp
diff --git a/test/util/number_conversions.cpp b/test/util/number_conversions.test.cpp
similarity index 100%
rename from test/util/number_conversions.cpp
rename to test/util/number_conversions.test.cpp
diff --git a/test/util/offscreen_texture.cpp b/test/util/offscreen_texture.test.cpp
similarity index 100%
rename from test/util/offscreen_texture.cpp
rename to test/util/offscreen_texture.test.cpp
diff --git a/test/util/projection.cpp b/test/util/projection.test.cpp
similarity index 100%
rename from test/util/projection.cpp
rename to test/util/projection.test.cpp
diff --git a/test/util/run_loop.cpp b/test/util/run_loop.test.cpp
similarity index 100%
rename from test/util/run_loop.cpp
rename to test/util/run_loop.test.cpp
diff --git a/test/util/text_conversions.cpp b/test/util/text_conversions.test.cpp
similarity index 100%
rename from test/util/text_conversions.cpp
rename to test/util/text_conversions.test.cpp
diff --git a/test/util/thread.cpp b/test/util/thread.test.cpp
similarity index 100%
rename from test/util/thread.cpp
rename to test/util/thread.test.cpp
diff --git a/test/util/thread_local.cpp b/test/util/thread_local.test.cpp
similarity index 100%
rename from test/util/thread_local.cpp
rename to test/util/thread_local.test.cpp
diff --git a/test/util/tile_cover.cpp b/test/util/tile_cover.test.cpp
similarity index 100%
rename from test/util/tile_cover.cpp
rename to test/util/tile_cover.test.cpp
diff --git a/test/util/timer.cpp b/test/util/timer.test.cpp
similarity index 100%
rename from test/util/timer.cpp
rename to test/util/timer.test.cpp
diff --git a/test/util/token.cpp b/test/util/token.test.cpp
similarity index 100%
rename from test/util/token.cpp
rename to test/util/token.test.cpp
diff --git a/test/util/work_queue.cpp b/test/util/work_queue.test.cpp
similarity index 100%
rename from test/util/work_queue.cpp
rename to test/util/work_queue.test.cpp