diff --git a/test/index.html b/test/index.html
index f427bbf7c..6441b0eba 100644
--- a/test/index.html
+++ b/test/index.html
@@ -64,20 +64,20 @@
     </script>
 
     <!-- include spec files here... -->
-    <script src="spec/util.js"></script>
-    <script src="spec/background.js"></script>
-    <script src="spec/way.js"></script>
-    <script src="spec/map.js"></script>
-    <script src="spec/hash.js"></script>
-    <script src="spec/oauth.js"></script>
-    <script src="spec/graph.js"></script>
-    <script src="spec/entity.js"></script>
-    <script src="spec/history.js"></script>
+    <script src="spec/format/geojson.js"></script>
+    <script src="spec/format/xml.js"></script>
+    <script src="spec/graph/graph.js"></script>
+    <script src="spec/graph/entity.js"></script>
+    <script src="spec/graph/history.js"></script>
+    <script src="spec/graph/way.js"></script>
+    <script src="spec/renderer/background.js"></script>
+    <script src="spec/renderer/hash.js"></script>
+    <script src="spec/renderer/map.js"></script>
+    <script src="spec/renderer/style.js"></script>
+    <script src="spec/ui/inspector.js"></script>
     <script src="spec/connection.js"></script>
-    <script src="spec/geojson.js"></script>
-    <script src="spec/xml.js"></script>
-    <script src="spec/style.js"></script>
-    <script src="spec/inspector.js"></script>
+    <script src="spec/oauth.js"></script>
+    <script src="spec/util.js"></script>
 
     <script>
         (window.mochaPhantomJS || window.mocha).run();
diff --git a/test/spec/GeoJSON.js b/test/spec/format/geojson.js
similarity index 100%
rename from test/spec/GeoJSON.js
rename to test/spec/format/geojson.js
diff --git a/test/spec/XML.js b/test/spec/format/xml.js
similarity index 100%
rename from test/spec/XML.js
rename to test/spec/format/xml.js
diff --git a/test/spec/Entity.js b/test/spec/graph/entity.js
similarity index 100%
rename from test/spec/Entity.js
rename to test/spec/graph/entity.js
diff --git a/test/spec/Graph.js b/test/spec/graph/graph.js
similarity index 100%
rename from test/spec/Graph.js
rename to test/spec/graph/graph.js
diff --git a/test/spec/history.js b/test/spec/graph/history.js
similarity index 100%
rename from test/spec/history.js
rename to test/spec/graph/history.js
diff --git a/test/spec/Way.js b/test/spec/graph/way.js
similarity index 100%
rename from test/spec/Way.js
rename to test/spec/graph/way.js
diff --git a/test/spec/background.js b/test/spec/renderer/background.js
similarity index 100%
rename from test/spec/background.js
rename to test/spec/renderer/background.js
diff --git a/test/spec/hash.js b/test/spec/renderer/hash.js
similarity index 100%
rename from test/spec/hash.js
rename to test/spec/renderer/hash.js
diff --git a/test/spec/Map.js b/test/spec/renderer/map.js
similarity index 100%
rename from test/spec/Map.js
rename to test/spec/renderer/map.js
diff --git a/test/spec/style.js b/test/spec/renderer/style.js
similarity index 100%
rename from test/spec/style.js
rename to test/spec/renderer/style.js
diff --git a/test/spec/Inspector.js b/test/spec/ui/inspector.js
similarity index 100%
rename from test/spec/Inspector.js
rename to test/spec/ui/inspector.js