diff --git a/modules/index.js b/modules/index.js
index 95a71a973..981a047db 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -1,3 +1,5 @@
+import * as d3 from 'd3';  // TODO: remove (needed for tests?)
+
 export * from './actions/index';
 export * from './behavior/index';
 export * from './core/index';
@@ -43,4 +45,4 @@ export var debug = false;
 
 import * as lib from './lib/index';
 
-export { lib };
+export { lib, d3 };
diff --git a/test/index.html b/test/index.html
index 4d6a2b13e..4d4ca1b70 100644
--- a/test/index.html
+++ b/test/index.html
@@ -5,7 +5,7 @@
     <title>Mocha Tests</title>
     <link rel='stylesheet' href='../node_modules/mocha/mocha.css'>
     <link rel='stylesheet' href='../dist/iD.css'>
-    <script src='../node_modules/d3/build/d3.js'></script>
+    <!-- <script src='../node_modules/d3/build/d3.js'></script> -->
 </head>
 <body style="overflow:scroll">
     <div id='mocha'></div>
diff --git a/test/spec/spec_helpers.js b/test/spec/spec_helpers.js
index de571a149..c67bbe06f 100644
--- a/test/spec/spec_helpers.js
+++ b/test/spec/spec_helpers.js
@@ -20,3 +20,5 @@ mocha.setup({
 });
 
 expect = chai.expect;
+
+window.d3 = iD.d3;   // TODO: remove
