diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 306e0bca5..62da4071e 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -135,8 +135,9 @@ afterEach ->
   atom.menu.template = []
   atom.contextMenu.clear()
 
-  atom.workspaceView?.remove?()
-  atom.workspaceView = null
+  atom.workspace?.destroy()
+  atom.workspace = null
+  atom.__workspaceView = null
   delete atom.state.workspace
 
   atom.project?.destroy()