diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee
index 66036e3e7..4a40c22d9 100644
--- a/spec/spec-helper.coffee
+++ b/spec/spec-helper.coffee
@@ -70,7 +70,6 @@ isCoreSpec = false
 
 {resourcePath} = atom.getLoadSettings()
 
-
 beforeEach ->
   documentTitle = null
 
@@ -146,8 +145,6 @@ beforeEach ->
 
 afterEach ->
   atom.packages.deactivatePackages()
-  atom.contextMenu.clear()
-  atom.notifications.clear()
 
   atom.workspace?.destroy()
   atom.workspace = null
diff --git a/src/atom-environment.coffee b/src/atom-environment.coffee
index 68b7e38df..78c44a962 100644
--- a/src/atom-environment.coffee
+++ b/src/atom-environment.coffee
@@ -249,6 +249,10 @@ class AtomEnvironment extends Model
 
     @clipboard.reset()
 
+    @notifications.clear()
+
+    @contextMenu.clear()
+
   ###
   Section: Event Subscription
   ###