diff --git a/js/id/presets.js b/js/id/presets.js
index 690c4b87a..4c0861644 100644
--- a/js/id/presets.js
+++ b/js/id/presets.js
@@ -14,7 +14,7 @@ iD.presets = function(context) {
             form: []
         },
         all = iD.presets.Collection([iD.presets.Preset(other)]),
-        defaults = {},
+        defaults = { area: all, line: all, point: all, vertex: all },
         forms = {};
 
     all.load = function(d) {
diff --git a/test/index.html b/test/index.html
index ef5b5f130..eb6be5487 100644
--- a/test/index.html
+++ b/test/index.html
@@ -34,7 +34,6 @@
     <script src='../js/id/util.js'></script>
     <script src='../js/id/oauth.js'></script>
     <script src='../js/id/services/taginfo.js'></script>
-    <script src='../js/id/presetdata.js'></script>
 
     <script src='../data/data.js'></script>
     <script src='../data/deprecated.js'></script>
@@ -144,6 +143,11 @@
     <script src='../js/id/core/way.js'></script>
     <script src='../js/id/core/tree.js'></script>
 
+    <script src='../js/id/presets.js'></script>
+    <script src='../js/id/presets/preset.js'></script>
+    <script src='../js/id/presets/category.js'></script>
+    <script src='../js/id/presets/collection.js'></script>
+
     <script src='../js/id/connection.js'></script>
 
     <script src='../js/lib/locale.js'></script>