diff --git a/API.md b/API.md
index 672aaaed0..8c686d5ec 100644
--- a/API.md
+++ b/API.md
@@ -147,7 +147,7 @@ iD can use external presets exclusively or along with the default OpenStreetMap
 
 ```js
 
-var id = iD.Context(window)
+var id = iD.Context()
   .presets(customPresets)
   .imagery(iD.dataImagery);
 
@@ -161,7 +161,7 @@ Just like Presets, Imagery can be configured using the `context.imagery` accesso
 
 ```js
 
-var id = iD.Context(window)
+var id = iD.Context()
   .presets(customPresets)
   .imagery(customImagery);
 
@@ -176,7 +176,7 @@ The minimum zoom at which iD enters the edit mode is configured using the `conte
 
 ```js
 
-var id = iD.Context(window).
+var id = iD.Context()
   .minEditableZoom(zoom_level)
 
 ```
diff --git a/data/presets/README.md b/data/presets/README.md
index 6c354019b..ac5d0986f 100644
--- a/data/presets/README.md
+++ b/data/presets/README.md
@@ -236,7 +236,7 @@ iD supports deployments which use a custom set of presets. You can supply preset
 the `presets` accessor:
 
 ```js
-var id = iD.Context(window).presets({
+var id = iD.Context().presets({
     presets: { ... },
     fields: { ... },
     defaults: { ... },
diff --git a/index.html b/index.html
index e8638d677..930cd9e1c 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
     <body>
         <div id='id-container'></div>
         <script>
-        id = iD.Context(window)
+        id = iD.Context()
             .presets(iD.dataPresets)
             .imagery(iD.dataImagery)
             .assetPath('dist/');
diff --git a/test/spec/actions/split.js b/test/spec/actions/split.js
index 35588f69c..94c304a51 100644
--- a/test/spec/actions/split.js
+++ b/test/spec/actions/split.js
@@ -1,7 +1,7 @@
 describe('iD.actionSplit', function () {
 
     beforeEach(function () {
-        iD.areaKeys = iD.Context(window)
+        iD.areaKeys = iD.Context()
             .presets(iD.dataPresets).presets().areaKeys();
     });
 
diff --git a/test/spec/behavior/hash.js b/test/spec/behavior/hash.js
index 15c86e963..8c129860c 100644
--- a/test/spec/behavior/hash.js
+++ b/test/spec/behavior/hash.js
@@ -4,7 +4,7 @@ describe('iD.behaviorHash', function () {
     var hash, context;
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         context.container(d3.select(document.createElement('div')));
 
         // Neuter connection
diff --git a/test/spec/behavior/lasso.js b/test/spec/behavior/lasso.js
index 3c93ea89d..842dcb503 100644
--- a/test/spec/behavior/lasso.js
+++ b/test/spec/behavior/lasso.js
@@ -2,7 +2,7 @@ describe('iD.behaviorLasso', function () {
     var lasso, context;
 
     beforeEach(function () {
-        context = iD.Context(window).imagery(iD.dataImagery);
+        context = iD.Context().imagery(iD.dataImagery);
         context.container(d3.select(document.createElement('div')));
 
         // Neuter connection
diff --git a/test/spec/behavior/select.js b/test/spec/behavior/select.js
index a75989bdc..c8c0e19cb 100644
--- a/test/spec/behavior/select.js
+++ b/test/spec/behavior/select.js
@@ -3,7 +3,7 @@ describe('iD.behaviorSelect', function() {
 
     beforeEach(function() {
         container = d3.select('body').append('div');
-        context = iD.Context(window).imagery(iD.dataImagery).container(container);
+        context = iD.Context().imagery(iD.dataImagery).container(container);
 
         a = iD.Node({loc: [0, 0]});
         b = iD.Node({loc: [0, 0]});
diff --git a/test/spec/core/context.js b/test/spec/core/context.js
index e5b7fb3a0..036b79d27 100644
--- a/test/spec/core/context.js
+++ b/test/spec/core/context.js
@@ -5,7 +5,7 @@ describe('iD.Context', function() {
 
     describe('#assetPath', function() {
         it('sets and gets assetPath', function() {
-            var context = iD.Context(window);
+            var context = iD.Context();
             expect(context.assetPath()).to.eql('');
 
             context.assetPath('iD/');
@@ -15,7 +15,7 @@ describe('iD.Context', function() {
 
     describe('#assetMap', function() {
         it('sets and gets assetMap', function() {
-            var context = iD.Context(window);
+            var context = iD.Context();
             expect(context.assetMap()).to.eql({});
 
             context.assetMap(assets);
@@ -26,7 +26,7 @@ describe('iD.Context', function() {
     describe('#asset', function() {
         var context;
         beforeEach(function() {
-            context = iD.Context(window).assetPath('iD/').assetMap(assets);
+            context = iD.Context().assetPath('iD/').assetMap(assets);
         });
 
         it('looks first in assetMap', function() {
@@ -40,7 +40,7 @@ describe('iD.Context', function() {
     describe('#imagePath', function() {
         var context;
         beforeEach(function() {
-            context = iD.Context(window).assetPath('iD/').assetMap(assets);
+            context = iD.Context().assetPath('iD/').assetMap(assets);
         });
 
         it('looks first in assetMap', function() {
@@ -91,7 +91,7 @@ describe('iD.Context', function() {
                 }
             };
 
-            var context = iD.Context(window).presets(presetsCollection),
+            var context = iD.Context().presets(presetsCollection),
                 way = iD.Way({tags: {concession: 'mining', area: 'yes'}}),
                 graph = iD.Graph([way]);
 
@@ -101,7 +101,7 @@ describe('iD.Context', function() {
 
     describe('#debug', function() {
         it('sets and gets debug flags', function() {
-            var context = iD.Context(window),
+            var context = iD.Context(),
                 flags = {
                     tile: false,
                     collision: false,
diff --git a/test/spec/core/history.js b/test/spec/core/history.js
index e89f5c799..723474153 100644
--- a/test/spec/core/history.js
+++ b/test/spec/core/history.js
@@ -3,7 +3,7 @@ describe('iD.History', function () {
         action = function() { return iD.Graph(); };
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         history = context.history();
         spy = sinon.spy();
         // clear lock
diff --git a/test/spec/modes/add_point.js b/test/spec/modes/add_point.js
index cfc717b42..af4ef361f 100644
--- a/test/spec/modes/add_point.js
+++ b/test/spec/modes/add_point.js
@@ -4,7 +4,7 @@ describe.skip('iD.modeAddPoint', function() {
     beforeEach(function() {
         var container = d3.select(document.createElement('div'));
 
-        context = iD.Context(window)
+        context = iD.Context()
             .presets(iD.dataPresets)
             .imagery([])
             .container(container);
diff --git a/test/spec/osm/way.js b/test/spec/osm/way.js
index 52aa73fac..a5879cdf2 100644
--- a/test/spec/osm/way.js
+++ b/test/spec/osm/way.js
@@ -318,7 +318,7 @@ describe('iD.osmWay', function() {
 
     describe('#isArea', function() {
         before(function() {
-            iD.Context(window).presets(iD.dataPresets);
+            iD.Context().presets(iD.dataPresets);
         });
 
         it('returns false when the way has no tags', function() {
diff --git a/test/spec/renderer/features.js b/test/spec/renderer/features.js
index 9b4c837f5..2c09ce658 100644
--- a/test/spec/renderer/features.js
+++ b/test/spec/renderer/features.js
@@ -4,7 +4,7 @@ describe('iD.Features', function() {
         features;
 
     beforeEach(function() {
-        context = iD.Context(window);
+        context = iD.Context();
         context.map().zoom(16);
         features = iD.Features(context);
     });
diff --git a/test/spec/renderer/map.js b/test/spec/renderer/map.js
index 48e81f881..8e75aed47 100644
--- a/test/spec/renderer/map.js
+++ b/test/spec/renderer/map.js
@@ -2,7 +2,7 @@ describe('iD.Map', function() {
     var context, map;
 
     beforeEach(function() {
-        context = iD.Context(window).imagery(iD.dataImagery);
+        context = iD.Context().imagery(iD.dataImagery);
         context.container(d3.select(document.createElement('div')));
         map = context.map();
         d3.select(document.createElement('div'))
diff --git a/test/spec/renderer/tile_layer.js b/test/spec/renderer/tile_layer.js
index 9b3fa2083..6d940a86a 100644
--- a/test/spec/renderer/tile_layer.js
+++ b/test/spec/renderer/tile_layer.js
@@ -2,7 +2,7 @@ describe('iD.TileLayer', function() {
     var context, d, c;
 
     beforeEach(function() {
-        context = iD.Context(window);
+        context = iD.Context();
         d = d3.select(document.createElement('div'));
         c = iD.TileLayer(context).projection(d3.geoMercator());
     });
diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js
index c9b1068d5..dca959baf 100644
--- a/test/spec/services/mapillary.js
+++ b/test/spec/services/mapillary.js
@@ -7,7 +7,7 @@ describe('iD.serviceMapillary', function() {
 
 
     beforeEach(function() {
-        context = iD.Context(window).assetPath('../dist/');
+        context = iD.Context().assetPath('../dist/');
         context.projection
             .scale(667544.214430109)  // z14
             .translate([-116508, 0])  // 10,0
diff --git a/test/spec/services/osm.js b/test/spec/services/osm.js
index 9609f38b5..fce8e6d68 100644
--- a/test/spec/services/osm.js
+++ b/test/spec/services/osm.js
@@ -18,7 +18,7 @@ describe('iD.serviceOsm', function () {
     }
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         connection = context.connection();
         connection.switch({ urlroot: 'http://www.openstreetmap.org' });
         connection.reset();
diff --git a/test/spec/svg/areas.js b/test/spec/svg/areas.js
index f7899f53f..3015a4465 100644
--- a/test/spec/svg/areas.js
+++ b/test/spec/svg/areas.js
@@ -8,7 +8,7 @@ describe('iD.svgAreas', function () {
         none = function() { return false; };
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
diff --git a/test/spec/svg/layers.js b/test/spec/svg/layers.js
index e95cc06ef..0997f6338 100644
--- a/test/spec/svg/layers.js
+++ b/test/spec/svg/layers.js
@@ -6,7 +6,7 @@ describe('iD.svgLayers', function () {
             .clipExtent([[0, 0], [Infinity, Infinity]]);
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         container = d3.select(document.createElement('div'));
     });
 
diff --git a/test/spec/svg/lines.js b/test/spec/svg/lines.js
index bd1ac97a7..001e12cc6 100644
--- a/test/spec/svg/lines.js
+++ b/test/spec/svg/lines.js
@@ -8,7 +8,7 @@ describe('iD.svgLines', function () {
         none = function() { return false; };
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
diff --git a/test/spec/svg/midpoints.js b/test/spec/svg/midpoints.js
index bc98a2401..b844b8628 100644
--- a/test/spec/svg/midpoints.js
+++ b/test/spec/svg/midpoints.js
@@ -7,7 +7,7 @@ describe('iD.svgMidpoints', function () {
         filter = function() { return true; };
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
diff --git a/test/spec/svg/points.js b/test/spec/svg/points.js
index 7a7594416..083ee63fe 100644
--- a/test/spec/svg/points.js
+++ b/test/spec/svg/points.js
@@ -6,7 +6,7 @@ describe('iD.svgPoints', function () {
             .clipExtent([[0, 0], [Infinity, Infinity]]);
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
diff --git a/test/spec/svg/vertices.js b/test/spec/svg/vertices.js
index 800190104..8c68b0075 100644
--- a/test/spec/svg/vertices.js
+++ b/test/spec/svg/vertices.js
@@ -6,7 +6,7 @@ describe('iD.svgVertices', function () {
             .clipExtent([[0, 0], [Infinity, Infinity]]);
 
     beforeEach(function () {
-        context = iD.Context(window);
+        context = iD.Context();
         d3.select(document.createElement('div'))
             .attr('id', 'map')
             .call(context.map());
diff --git a/test/spec/ui/fields/access.js b/test/spec/ui/fields/access.js
index 00974a177..772a543ee 100644
--- a/test/spec/ui/fields/access.js
+++ b/test/spec/ui/fields/access.js
@@ -2,7 +2,7 @@ describe('iD.uiFieldAccess', function() {
     var selection, field;
     beforeEach(function() {
         selection = d3.select(document.createElement('div'));
-        field = iD.Context(window)
+        field = iD.Context()
             .presets(iD.dataPresets).presets().field('access');
     });
 
diff --git a/test/spec/ui/fields/wikipedia.js b/test/spec/ui/fields/wikipedia.js
index 96951929f..237a21671 100644
--- a/test/spec/ui/fields/wikipedia.js
+++ b/test/spec/ui/fields/wikipedia.js
@@ -11,7 +11,7 @@ describe('iD.uiFieldWikipedia', function() {
     beforeEach(function() {
         entity = iD.Node({id: 'n12345'});
         selectedId = entity.id;
-        context = iD.Context(window);
+        context = iD.Context();
         context.history().merge([entity]);
         selection = d3.select(document.createElement('div'));
         field = context.presets(iD.dataPresets).presets().field('wikipedia');
diff --git a/test/spec/ui/raw_tag_editor.js b/test/spec/ui/raw_tag_editor.js
index 7d605f35b..e7f46999e 100644
--- a/test/spec/ui/raw_tag_editor.js
+++ b/test/spec/ui/raw_tag_editor.js
@@ -15,7 +15,7 @@ describe('iD.uiRawTagEditor', function() {
 
     beforeEach(function () {
         entity = iD.Node({id: 'n12345'});
-        context = iD.Context(window);
+        context = iD.Context();
         context.history().merge([entity]);
         render({highway: 'residential'});
     });
