diff --git a/exports/atom.coffee b/exports/atom.coffee
index 3c98e06ae..7e2907485 100644
--- a/exports/atom.coffee
+++ b/exports/atom.coffee
@@ -1,10 +1,8 @@
 {Point, Range} = require 'text-buffer'
 
 module.exports =
-  _: require 'underscore-plus'
   BufferedNodeProcess: require '../src/buffered-node-process'
   BufferedProcess: require '../src/buffered-process'
-  fs: require 'fs-plus'
   Git: require '../src/git'
   Point: Point
   Range: Range
diff --git a/spec/atom-spec.coffee b/spec/atom-spec.coffee
index fcd6cf6a2..f9405be57 100644
--- a/spec/atom-spec.coffee
+++ b/spec/atom-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs, WorkspaceView}  = require 'atom'
+{$, $$, WorkspaceView}  = require 'atom'
 Exec = require('child_process').exec
 path = require 'path'
 Package = require '../src/package'
diff --git a/spec/command-installer-spec.coffee b/spec/command-installer-spec.coffee
index e0624b6d3..7a97094f4 100644
--- a/spec/command-installer-spec.coffee
+++ b/spec/command-installer-spec.coffee
@@ -1,5 +1,5 @@
-{fs} = require 'atom'
 path = require 'path'
+fs = require 'fs-plus'
 temp = require 'temp'
 installer = require '../src/command-installer'
 
diff --git a/spec/config-spec.coffee b/spec/config-spec.coffee
index 02ef6d6d8..0dfe87b60 100644
--- a/spec/config-spec.coffee
+++ b/spec/config-spec.coffee
@@ -1,7 +1,7 @@
-{fs} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 CSON = require 'season'
+fs = require 'fs-plus'
 
 describe "Config", ->
   dotAtomPath = path.join(temp.dir, 'dot-atom-dir')
@@ -217,7 +217,7 @@ describe "Config", ->
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the configDirPath doesn't exist", ->
       it "copies the contents of dot-atom to ~/.atom", ->
@@ -243,7 +243,7 @@ describe "Config", ->
       expect(fs.existsSync(atom.config.configDirPath)).toBeFalsy()
 
     afterEach ->
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file contains valid cson", ->
       beforeEach ->
@@ -286,7 +286,7 @@ describe "Config", ->
 
     afterEach ->
       atom.config.unobserveUserConfig()
-      fs.removeSync(dotAtomPath) if fs.existsSync(dotAtomPath)
+      fs.removeSync(dotAtomPath)
 
     describe "when the config file changes to contain valid cson", ->
       it "updates the config data", ->
diff --git a/spec/display-buffer-spec.coffee b/spec/display-buffer-spec.coffee
index 6e13ee8f4..08814c5b0 100644
--- a/spec/display-buffer-spec.coffee
+++ b/spec/display-buffer-spec.coffee
@@ -1,5 +1,5 @@
 DisplayBuffer = require '../src/display-buffer'
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 describe "DisplayBuffer", ->
   [displayBuffer, buffer, changeHandler, tabLength] = []
diff --git a/spec/git-spec.coffee b/spec/git-spec.coffee
index 485d4dbbe..66feef000 100644
--- a/spec/git-spec.coffee
+++ b/spec/git-spec.coffee
@@ -1,6 +1,6 @@
 temp = require 'temp'
 Git = require '../src/git'
-{fs} = require 'atom'
+fs = require 'fs-plus'
 path = require 'path'
 Task = require '../src/task'
 
diff --git a/spec/pane-container-view-spec.coffee b/spec/pane-container-view-spec.coffee
index 149658b0e..618f2e84d 100644
--- a/spec/pane-container-view-spec.coffee
+++ b/spec/pane-container-view-spec.coffee
@@ -2,7 +2,7 @@ path = require 'path'
 temp = require 'temp'
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{_, $, View, $$} = require 'atom'
+{$, View, $$} = require 'atom'
 
 describe "PaneContainerView", ->
   [TestView, container, pane1, pane2, pane3] = []
diff --git a/spec/pane-view-spec.coffee b/spec/pane-view-spec.coffee
index 049f15fc8..e86fb750f 100644
--- a/spec/pane-view-spec.coffee
+++ b/spec/pane-view-spec.coffee
@@ -1,6 +1,7 @@
 PaneContainerView = require '../src/pane-container-view'
 PaneView = require '../src/pane-view'
-{fs, $, View} = require 'atom'
+fs = require 'fs-plus'
+{$, View} = require 'atom'
 path = require 'path'
 temp = require 'temp'
 
diff --git a/spec/project-spec.coffee b/spec/project-spec.coffee
index e33413f97..fa26e2754 100644
--- a/spec/project-spec.coffee
+++ b/spec/project-spec.coffee
@@ -1,7 +1,8 @@
 temp = require 'temp'
 fstream = require 'fstream'
 Project = require '../src/project'
-{_, fs} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
 path = require 'path'
 platform = require './spec-helper-platform'
 BufferedProcess = require '../src/buffered-process'
diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 3c8efb624..81b7dc630 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -4,7 +4,9 @@ atom.restoreWindowDimensions()
 
 require '../vendor/jasmine-jquery'
 path = require 'path'
-{_, $, WorkspaceView, fs} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
+{$, WorkspaceView} = require 'atom'
 Keymap = require '../src/keymap'
 Config = require '../src/config'
 {Point} = require 'text-buffer'
diff --git a/spec/spec-suite.coffee b/spec/spec-suite.coffee
index 6beade358..c27d82548 100644
--- a/spec/spec-suite.coffee
+++ b/spec/spec-suite.coffee
@@ -1,4 +1,6 @@
-{_, fs, Git} = require 'atom'
+_ = require 'underscore-plus'
+fs = require 'fs-plus'
+{Git} = require 'atom'
 path = require 'path'
 require './spec-helper'
 
diff --git a/spec/syntax-spec.coffee b/spec/syntax-spec.coffee
index c39d12152..3b6745155 100644
--- a/spec/syntax-spec.coffee
+++ b/spec/syntax-spec.coffee
@@ -1,5 +1,5 @@
-{fs} = require 'atom'
 path = require 'path'
+fs = require 'fs-plus'
 temp = require 'temp'
 
 describe "the `syntax` global", ->
diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
index 490f1137c..a3a0b399e 100644
--- a/spec/theme-manager-spec.coffee
+++ b/spec/theme-manager-spec.coffee
@@ -1,6 +1,7 @@
 path = require 'path'
 
-{$, $$, fs, WorkspaceView} = require 'atom'
+{$, $$, WorkspaceView} = require 'atom'
+fs = require 'fs-plus'
 temp = require 'temp'
 
 ThemeManager = require '../src/theme-manager'
diff --git a/spec/time-reporter.coffee b/spec/time-reporter.coffee
index f244be76c..a02c47286 100644
--- a/spec/time-reporter.coffee
+++ b/spec/time-reporter.coffee
@@ -1,4 +1,4 @@
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 module.exports =
 class TimeReporter extends jasmine.Reporter
diff --git a/spec/tokenized-buffer-spec.coffee b/spec/tokenized-buffer-spec.coffee
index 2fad95256..d1c619d2c 100644
--- a/spec/tokenized-buffer-spec.coffee
+++ b/spec/tokenized-buffer-spec.coffee
@@ -1,5 +1,5 @@
 TokenizedBuffer = require '../src/tokenized-buffer'
-{_} = require 'atom'
+_ = require 'underscore-plus'
 
 describe "TokenizedBuffer", ->
   [tokenizedBuffer, buffer, changeHandler] = []
diff --git a/spec/window-spec.coffee b/spec/window-spec.coffee
index 78f90d3b7..065cb2005 100644
--- a/spec/window-spec.coffee
+++ b/spec/window-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs} = require 'atom'
+{$, $$} = require 'atom'
 path = require 'path'
 Editor = require '../src/editor'
 WindowEventHandler = require '../src/window-event-handler'
diff --git a/spec/workspace-view-spec.coffee b/spec/workspace-view-spec.coffee
index 245666c23..e034d9ed4 100644
--- a/spec/workspace-view-spec.coffee
+++ b/spec/workspace-view-spec.coffee
@@ -1,4 +1,4 @@
-{$, $$, fs, WorkspaceView, View} = require 'atom'
+{$, $$, WorkspaceView, View} = require 'atom'
 Q = require 'q'
 path = require 'path'
 temp = require 'temp'