diff --git a/api/tests/test-mountRedraw.js b/api/tests/test-mountRedraw.js
index 4027c1c3e..e069e9b2c 100644
--- a/api/tests/test-mountRedraw.js
+++ b/api/tests/test-mountRedraw.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var throttleMocker = require("../../test-utils/throttleMock")
diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index 97bbc4eb6..be4c20cf8 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")
 
diff --git a/api/tests/test-routerGetSet.js b/api/tests/test-routerGetSet.js
index 6a7121b2a..aaffdc91a 100644
--- a/api/tests/test-routerGetSet.js
+++ b/api/tests/test-routerGetSet.js
@@ -1,7 +1,7 @@
 "use strict"
 
 // Low-priority TODO: remove the dependency on the renderer here.
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var browserMock = require("../../test-utils/browserMock")
 var throttleMocker = require("../../test-utils/throttleMock")
diff --git a/ospec/tests/test-ospec.js b/ospec/tests/test-ospec.js
index 740d77b77..434f6895f 100644
--- a/ospec/tests/test-ospec.js
+++ b/ospec/tests/test-ospec.js
@@ -6,7 +6,11 @@ var o, callAsync
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
+	var warn = console.warn
+	// Let's drop the warning to leave the console a little less noisy.
+	console.warn = function() {}
 	o = require("../ospec")
+	console.warn = warn
 	/* eslint-enable global-require */
 } else {
 	callAsync = typeof setImmediate === "function" ? setImmediate : setTimeout
diff --git a/pathname/tests/test-buildPathname.js b/pathname/tests/test-buildPathname.js
index 11d6cfb08..0b763d154 100644
--- a/pathname/tests/test-buildPathname.js
+++ b/pathname/tests/test-buildPathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildPathname = require("../../pathname/build")
 
 o.spec("buildPathname", function() {
diff --git a/pathname/tests/test-compileTemplate.js b/pathname/tests/test-compileTemplate.js
index 1fa37bdff..e9725b06c 100644
--- a/pathname/tests/test-compileTemplate.js
+++ b/pathname/tests/test-compileTemplate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 var compileTemplate = require("../../pathname/compileTemplate")
 
diff --git a/pathname/tests/test-parsePathname.js b/pathname/tests/test-parsePathname.js
index 565b08401..b81d34f1a 100644
--- a/pathname/tests/test-parsePathname.js
+++ b/pathname/tests/test-parsePathname.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parsePathname = require("../../pathname/parse")
 
 o.spec("parsePathname", function() {
diff --git a/promise/tests/test-promise.js b/promise/tests/test-promise.js
index d26dd5f80..07d600e1b 100644
--- a/promise/tests/test-promise.js
+++ b/promise/tests/test-promise.js
@@ -6,7 +6,7 @@ var o, callAsync, Promise
 if (typeof require !== "undefined") {
 	/* eslint-disable global-require */
 	callAsync = require("../../test-utils/callAsync")
-	o = require("../../ospec/ospec")
+	o = require("ospec")
 	Promise = require("../../promise/polyfill")
 	/* eslint-enable global-require */
 } else {
diff --git a/querystring/tests/test-buildQueryString.js b/querystring/tests/test-buildQueryString.js
index 343b6c8e6..9b5149af5 100644
--- a/querystring/tests/test-buildQueryString.js
+++ b/querystring/tests/test-buildQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var buildQueryString = require("../../querystring/build")
 
 o.spec("buildQueryString", function() {
diff --git a/querystring/tests/test-parseQueryString.js b/querystring/tests/test-parseQueryString.js
index ca20e2328..4a61c4314 100644
--- a/querystring/tests/test-parseQueryString.js
+++ b/querystring/tests/test-parseQueryString.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parseQueryString = require("../../querystring/parse")
 
 o.spec("parseQueryString", function() {
diff --git a/render/tests/test-attributes.js b/render/tests/test-attributes.js
index 156323959..14a3b4062 100644
--- a/render/tests/test-attributes.js
+++ b/render/tests/test-attributes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-component.js b/render/tests/test-component.js
index 423ceeada..20dc02be4 100644
--- a/render/tests/test-component.js
+++ b/render/tests/test-component.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-createElement.js b/render/tests/test-createElement.js
index ba250a6ef..21e5e4d72 100644
--- a/render/tests/test-createElement.js
+++ b/render/tests/test-createElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createFragment.js b/render/tests/test-createFragment.js
index 5000f859e..37bdb8b0d 100644
--- a/render/tests/test-createFragment.js
+++ b/render/tests/test-createFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createHTML.js b/render/tests/test-createHTML.js
index 291f8f044..54de6a97b 100644
--- a/render/tests/test-createHTML.js
+++ b/render/tests/test-createHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createNodes.js b/render/tests/test-createNodes.js
index 649ebf9a9..3ba849056 100644
--- a/render/tests/test-createNodes.js
+++ b/render/tests/test-createNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-createText.js b/render/tests/test-createText.js
index 7a05c44ef..76cb3e3df 100644
--- a/render/tests/test-createText.js
+++ b/render/tests/test-createText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-event.js b/render/tests/test-event.js
index b0b005926..8e650b91b 100644
--- a/render/tests/test-event.js
+++ b/render/tests/test-event.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-fragment.js b/render/tests/test-fragment.js
index e6883161d..02af0a9dd 100644
--- a/render/tests/test-fragment.js
+++ b/render/tests/test-fragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var fragment = require("../../render/fragment")
 var m = require("../../render/hyperscript")
 
diff --git a/render/tests/test-hyperscript.js b/render/tests/test-hyperscript.js
index 34d359745..cdb9071b1 100644
--- a/render/tests/test-hyperscript.js
+++ b/render/tests/test-hyperscript.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 
 o.spec("hyperscript", function() {
diff --git a/render/tests/test-input.js b/render/tests/test-input.js
index e28784a22..d7fbd6d87 100644
--- a/render/tests/test-input.js
+++ b/render/tests/test-input.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-normalize.js b/render/tests/test-normalize.js
index 2036d2ac0..3a656dd86 100644
--- a/render/tests/test-normalize.js
+++ b/render/tests/test-normalize.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalize", function() {
diff --git a/render/tests/test-normalizeChildren.js b/render/tests/test-normalizeChildren.js
index 769c39d19..a7cd5ba5b 100644
--- a/render/tests/test-normalizeChildren.js
+++ b/render/tests/test-normalizeChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Vnode = require("../../render/vnode")
 
 o.spec("normalizeChildren", function() {
diff --git a/render/tests/test-normalizeComponentChildren.js b/render/tests/test-normalizeComponentChildren.js
index 6ef57f6c3..0ceabdf4f 100644
--- a/render/tests/test-normalizeComponentChildren.js
+++ b/render/tests/test-normalizeComponentChildren.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-onbeforeremove.js b/render/tests/test-onbeforeremove.js
index 9e9a2e59e..96f5025e9 100644
--- a/render/tests/test-onbeforeremove.js
+++ b/render/tests/test-onbeforeremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
diff --git a/render/tests/test-onbeforeupdate.js b/render/tests/test-onbeforeupdate.js
index e179bad29..a4e50c480 100644
--- a/render/tests/test-onbeforeupdate.js
+++ b/render/tests/test-onbeforeupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-oncreate.js b/render/tests/test-oncreate.js
index df651f900..0358046f4 100644
--- a/render/tests/test-oncreate.js
+++ b/render/tests/test-oncreate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-oninit.js b/render/tests/test-oninit.js
index a42d51008..c2ce1248c 100644
--- a/render/tests/test-oninit.js
+++ b/render/tests/test-oninit.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-onremove.js b/render/tests/test-onremove.js
index c10b3c891..8643b105e 100644
--- a/render/tests/test-onremove.js
+++ b/render/tests/test-onremove.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-onupdate.js b/render/tests/test-onupdate.js
index 10794dd0c..e57612ab3 100644
--- a/render/tests/test-onupdate.js
+++ b/render/tests/test-onupdate.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-render-hyperscript-integration.js b/render/tests/test-render-hyperscript-integration.js
index 1b722fb05..7a94eb879 100644
--- a/render/tests/test-render-hyperscript-integration.js
+++ b/render/tests/test-render-hyperscript-integration.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var m = require("../../render/hyperscript")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-render.js b/render/tests/test-render.js
index 7898c9a7a..06b441869 100644
--- a/render/tests/test-render.js
+++ b/render/tests/test-render.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-textContent.js b/render/tests/test-textContent.js
index 0cdd0b4ca..50f79a464 100644
--- a/render/tests/test-textContent.js
+++ b/render/tests/test-textContent.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-trust.js b/render/tests/test-trust.js
index d0f4b2ca5..304708cc6 100644
--- a/render/tests/test-trust.js
+++ b/render/tests/test-trust.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var trust = require("../../render/trust")
 
 o.spec("trust", function() {
diff --git a/render/tests/test-updateElement.js b/render/tests/test-updateElement.js
index 7a7285fab..e60ac5508 100644
--- a/render/tests/test-updateElement.js
+++ b/render/tests/test-updateElement.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateFragment.js b/render/tests/test-updateFragment.js
index e0cdecf80..1c127541c 100644
--- a/render/tests/test-updateFragment.js
+++ b/render/tests/test-updateFragment.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateHTML.js b/render/tests/test-updateHTML.js
index b95fc9b15..5ed8d73a9 100644
--- a/render/tests/test-updateHTML.js
+++ b/render/tests/test-updateHTML.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateNodes.js b/render/tests/test-updateNodes.js
index 5ce9e32f5..b5ff7efa7 100644
--- a/render/tests/test-updateNodes.js
+++ b/render/tests/test-updateNodes.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
diff --git a/render/tests/test-updateNodesFuzzer.js b/render/tests/test-updateNodesFuzzer.js
index 1e2116b36..e63a0d8aa 100644
--- a/render/tests/test-updateNodesFuzzer.js
+++ b/render/tests/test-updateNodesFuzzer.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/render/tests/test-updateText.js b/render/tests/test-updateText.js
index f8579dead..05b33a85e 100644
--- a/render/tests/test-updateText.js
+++ b/render/tests/test-updateText.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 var vdom = require("../../render/render")
 
diff --git a/request/tests/test-jsonp.js b/request/tests/test-jsonp.js
index 6dfed4e7c..a52c67a8a 100644
--- a/request/tests/test-jsonp.js
+++ b/request/tests/test-jsonp.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")
 var PromisePolyfill = require("../../promise/promise")
diff --git a/request/tests/test-request.js b/request/tests/test-request.js
index 706c8404b..51e8b0b36 100644
--- a/request/tests/test-request.js
+++ b/request/tests/test-request.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 var xhrMock = require("../../test-utils/xhrMock")
 var Request = require("../../request/request")
diff --git a/scripts/tests/test-bundler.js b/scripts/tests/test-bundler.js
index 7c0cdb7ca..b797bcb49 100644
--- a/scripts/tests/test-bundler.js
+++ b/scripts/tests/test-bundler.js
@@ -6,7 +6,7 @@ const access = util.promisify(fs.access)
 const writeFile = util.promisify(fs.writeFile)
 const unlink = util.promisify(fs.unlink)
 
-const o = require("../../ospec/ospec")
+const o = require("ospec")
 const bundle = require("../_bundler-impl")
 
 o.spec("bundler", async () => {
diff --git a/stream/tests/test-scan.js b/stream/tests/test-scan.js
index 22ee4407d..5940c3d17 100644
--- a/stream/tests/test-scan.js
+++ b/stream/tests/test-scan.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scan", function() {
diff --git a/stream/tests/test-scanMerge.js b/stream/tests/test-scanMerge.js
index cbf1e7f19..0a441f73d 100644
--- a/stream/tests/test-scanMerge.js
+++ b/stream/tests/test-scanMerge.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var stream = require("../stream")
 
 o.spec("scanMerge", function() {
diff --git a/stream/tests/test-stream.js b/stream/tests/test-stream.js
index 30f3a1f30..02044d6c2 100644
--- a/stream/tests/test-stream.js
+++ b/stream/tests/test-stream.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var Stream = require("../stream")
 
 o.spec("stream", function() {
diff --git a/test-utils/tests/test-browserMock.js b/test-utils/tests/test-browserMock.js
index 861f1ef07..c08b573fe 100644
--- a/test-utils/tests/test-browserMock.js
+++ b/test-utils/tests/test-browserMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../../test-utils/browserMock")
 var callAsync = require("../../test-utils/callAsync")
 o.spec("browserMock", function() {
diff --git a/test-utils/tests/test-callAsync.js b/test-utils/tests/test-callAsync.js
index a6bedb5ba..579269e25 100644
--- a/test-utils/tests/test-callAsync.js
+++ b/test-utils/tests/test-callAsync.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var callAsync = require("../../test-utils/callAsync")
 
 o.spec("callAsync", function() {
diff --git a/test-utils/tests/test-components.js b/test-utils/tests/test-components.js
index 3094cff20..47ad5a7d4 100644
--- a/test-utils/tests/test-components.js
+++ b/test-utils/tests/test-components.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var components = require("../../test-utils/components")
 
 o.spec("test-utils/components", function() {
diff --git a/test-utils/tests/test-domMock.js b/test-utils/tests/test-domMock.js
index 5c22c53da..269b641b7 100644
--- a/test-utils/tests/test-domMock.js
+++ b/test-utils/tests/test-domMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var domMock = require("../../test-utils/domMock")
 
 o.spec("domMock", function() {
diff --git a/test-utils/tests/test-parseURL.js b/test-utils/tests/test-parseURL.js
index dff926838..5a1e3567d 100644
--- a/test-utils/tests/test-parseURL.js
+++ b/test-utils/tests/test-parseURL.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var parseURL = require("../../test-utils/parseURL")
 
 o.spec("parseURL", function() {
diff --git a/test-utils/tests/test-pushStateMock.js b/test-utils/tests/test-pushStateMock.js
index b07ee1b4c..989d1dc21 100644
--- a/test-utils/tests/test-pushStateMock.js
+++ b/test-utils/tests/test-pushStateMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var pushStateMock = require("../../test-utils/pushStateMock")
 var callAsync = require("../../test-utils/callAsync")
 o.spec("pushStateMock", function() {
diff --git a/test-utils/tests/test-throttleMock.js b/test-utils/tests/test-throttleMock.js
index fd00d2bd0..b537b43af 100644
--- a/test-utils/tests/test-throttleMock.js
+++ b/test-utils/tests/test-throttleMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var throttleMocker = require("../../test-utils/throttleMock")
 
 o.spec("throttleMock", function() {
diff --git a/test-utils/tests/test-xhrMock.js b/test-utils/tests/test-xhrMock.js
index 410811b8a..1639ca64c 100644
--- a/test-utils/tests/test-xhrMock.js
+++ b/test-utils/tests/test-xhrMock.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var xhrMock = require("../../test-utils/xhrMock")
 var parseQueryString = require("../../querystring/parse")
 
diff --git a/tests/test-api.js b/tests/test-api.js
index da6026269..c64e749ab 100644
--- a/tests/test-api.js
+++ b/tests/test-api.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../ospec/ospec")
+var o = require("ospec")
 var browserMock = require("../test-utils/browserMock")
 var components = require("../test-utils/components")
 
diff --git a/util/tests/test-censor.js b/util/tests/test-censor.js
index 625641dfb..18500e202 100644
--- a/util/tests/test-censor.js
+++ b/util/tests/test-censor.js
@@ -1,6 +1,6 @@
 "use strict"
 
-var o = require("../../ospec/ospec")
+var o = require("ospec")
 var censor = require("../../util/censor")
 
 o.spec("censor", function() {