diff --git a/benchmark/benchmark-helper.coffee b/benchmark/benchmark-helper.coffee
index 9b08d8795..ae6bab740 100644
--- a/benchmark/benchmark-helper.coffee
+++ b/benchmark/benchmark-helper.coffee
@@ -1,7 +1,8 @@
 require '../spec/spec-helper'
 
 path = require 'path'
-{$, Point} = require 'atom'
+{$} = require '../src/space-pen-extensions'
+{Point} = require 'atom'
 _ = require 'underscore-plus'
 fs = require 'fs-plus'
 Project = require '../src/project'
diff --git a/benchmark/benchmark-suite.coffee b/benchmark/benchmark-suite.coffee
index f4eb62cd8..7a17f22c2 100644
--- a/benchmark/benchmark-suite.coffee
+++ b/benchmark/benchmark-suite.coffee
@@ -1,5 +1,7 @@
 require './benchmark-helper'
-{$, _, WorkspaceView} = require 'atom'
+{$} = require '../src/space-pen-extensions'
+_ = require 'underscore-plus'
+{WorkspaceView} = require 'atom'
 TokenizedBuffer = require '../src/tokenized-buffer'
 
 describe "editorView.", ->
diff --git a/spec/atom-protocol-handler-spec.coffee b/spec/atom-protocol-handler-spec.coffee
index 51b215716..d1a502910 100644
--- a/spec/atom-protocol-handler-spec.coffee
+++ b/spec/atom-protocol-handler-spec.coffee
@@ -1,4 +1,4 @@
-{$} = require 'atom'
+{$} = require '../src/space-pen-extensions'
 
 describe '"atom" protocol URL', ->
   it 'sends the file relative in the package as response', ->
diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index e8d60ec92..d4c9ff626 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -1,10 +1,10 @@
-{$, $$, WorkspaceView}  = require 'atom'
+{$, $$}  = require '../src/space-pen-extensions'
 Exec = require('child_process').exec
 path = require 'path'
 Package = require '../src/package'
 ThemeManager = require '../src/theme-manager'
 
-describe "the `atom` global", ->
+fdescribe "the `atom` global", ->
   describe 'window sizing methods', ->
     describe '::getPosition and ::setPosition', ->
       it 'sets the position of the window, and can retrieve the position just set', ->
diff --git a/spec/context-menu-manager-spec.coffee b/spec/context-menu-manager-spec.coffee
index 29d2d8fa9..6c109e7d0 100644
--- a/spec/context-menu-manager-spec.coffee
+++ b/spec/context-menu-manager-spec.coffee
@@ -1,4 +1,4 @@
-{$$} = require 'atom'
+{$$} = require '../src/space-pen-extensions'
 
 ContextMenuManager = require '../src/context-menu-manager'
 
diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index 4e5186700..b96cbcf26 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -1,4 +1,5 @@
-{$, $$, WorkspaceView}  = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
+{WorkspaceView}  = require 'atom'
 Package = require '../src/package'
 
 describe "PackageManager", ->
diff --git a/spec/package-spec.coffee b/spec/package-spec.coffee
index 970d9b64f..8f968bb9f 100644
--- a/spec/package-spec.coffee
+++ b/spec/package-spec.coffee
@@ -1,4 +1,4 @@
-{$} = require 'atom'
+{$} = require '../src/space-pen-extensions'
 path = require 'path'
 Package = require '../src/package'
 ThemePackage = require '../src/theme-package'
diff --git a/spec/pane-container-view-spec.coffee b/spec/pane-container-view-spec.coffee
index b0989cfaf..9e2f0cef7 100644
--- a/spec/pane-container-view-spec.coffee
+++ b/spec/pane-container-view-spec.coffee
@@ -3,7 +3,7 @@ temp = require 'temp'
 PaneContainer = require '../src/pane-container'
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{$, View, $$} = require 'atom'
+{$, View, $$} = require '../src/space-pen-extensions'
 
 describe "PaneContainerView", ->
   [TestView, container, pane1, pane2, pane3, deserializerDisposable] = []
diff --git a/spec/pane-view-spec.coffee b/spec/pane-view-spec.coffee
index db6d53c3e..6215d62f9 100644
--- a/spec/pane-view-spec.coffee
+++ b/spec/pane-view-spec.coffee
@@ -2,7 +2,7 @@ PaneContainer = require '../src/pane-container'
 PaneView = require '../src/pane-view'
 fs = require 'fs-plus'
 {Emitter} = require 'event-kit'
-{$, View} = require 'atom'
+{$, View} = require '../src/space-pen-extensions'
 path = require 'path'
 temp = require 'temp'
 
diff --git a/spec/select-list-view-spec.coffee b/spec/select-list-view-spec.coffee
index db6a1b8c8..e22b24f88 100644
--- a/spec/select-list-view-spec.coffee
+++ b/spec/select-list-view-spec.coffee
@@ -1,5 +1,5 @@
 SelectListView = require '../src/select-list-view'
-{$, $$} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 
 describe "SelectListView", ->
   [selectList, items, list, filterEditorView] = []
diff --git a/spec/space-pen-extensions-spec.coffee b/spec/space-pen-extensions-spec.coffee
index 0808ae600..e11b32de9 100644
--- a/spec/space-pen-extensions-spec.coffee
+++ b/spec/space-pen-extensions-spec.coffee
@@ -1,4 +1,4 @@
-{View, $, $$} = require 'atom'
+{View, $, $$} = require '../src/space-pen-extensions'
 
 describe "SpacePen extensions", ->
   class TestView extends View
diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index 8c783ee54..475400b35 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -1,6 +1,7 @@
 path = require 'path'
 
-{$, $$, WorkspaceView} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
+{WorkspaceView} = require 'atom'
 fs = require 'fs-plus'
 temp = require 'temp'
 
diff --git a/spec/window-spec.coffee b/spec/window-spec.coffee
index ad7da19c6..b60915e3c 100644
--- a/spec/window-spec.coffee
+++ b/spec/window-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$} = require 'atom'
+{$, $$} = require '../src/space-pen-extensions'
 path = require 'path'
 TextEditor = require '../src/text-editor'
 WindowEventHandler = require '../src/window-event-handler'
diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee
index f9b772b75..6dd169fe8 100644
--- a/spec/workspace-view-spec.coffee
+++ b/spec/workspace-view-spec.coffee
@@ -1,4 +1,5 @@
-{$, $$, WorkspaceView, View} = require 'atom'
+{$, $$, View} = require '../src/space-pen-extensions'
+{WorkspaceView} = require 'atom'
 Q = require 'q'
 path = require 'path'
 temp = require 'temp'