diff --git a/spec-nylas/stores/namespace-store-spec.coffee b/spec-nylas/stores/namespace-store-spec.coffee
index bbafec1f3..0179f8c48 100644
--- a/spec-nylas/stores/namespace-store-spec.coffee
+++ b/spec-nylas/stores/namespace-store-spec.coffee
@@ -3,8 +3,12 @@ NamespaceStore = require '../../src/flux/stores/namespace-store'
 
 describe "NamespaceStore", ->
   beforeEach ->
+    @instance = null
     @constructor = NamespaceStore.constructor
 
+  afterEach ->
+    @instance.stopListeningToAll()
+
   it "should initialize current() using data saved in config", ->
     state =
       "id": "123",
@@ -13,16 +17,16 @@ describe "NamespaceStore", ->
       "organization_unit": "label"
 
     spyOn(atom.config, 'get').andCallFake -> state
-    instance = new @constructor
-    expect(instance.current().id).toEqual(state['id'])
-    expect(instance.current().emailAddress).toEqual(state['email_address'])
+    @instance = new @constructor
+    expect(@instance.current().id).toEqual(state['id'])
+    expect(@instance.current().emailAddress).toEqual(state['email_address'])
 
   it "should initialize current() to null if data is not present", ->
     spyOn(atom.config, 'get').andCallFake -> null
-    instance = new @constructor
-    expect(instance.current()).toEqual(null)
+    @instance = new @constructor
+    expect(@instance.current()).toEqual(null)
 
   it "should initialize current() to null if data is invalid", ->
     spyOn(atom.config, 'get').andCallFake -> "this isn't an object"
-    instance = new @constructor
-    expect(instance.current()).toEqual(null)
+    @instance = new @constructor
+    expect(@instance.current()).toEqual(null)