diff --git a/spec/package-manager-spec.coffee b/spec/package-manager-spec.coffee
index 1d0415149..99b1bdcd3 100644
--- a/spec/package-manager-spec.coffee
+++ b/spec/package-manager-spec.coffee
@@ -452,18 +452,17 @@ describe "PackageManager", ->
           runs ->
             expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
 
-      describe "when the package's keymaps are disabled at activation and re-enabled later", ->
-        it "re-adds the keymaps", ->
+      describe "when the package's keymaps are disabled and re-enabled after it is activated", ->
+        it "removes and re-adds the keymaps", ->
           element1 = $$ -> @div class: 'test-1'
 
-          expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
-
-          atom.config.set("core.disabledKeymaps", ["package-with-keymaps-manifest"])
-
           waitsForPromise ->
             atom.packages.activatePackage("package-with-keymaps-manifest")
 
           runs ->
+            atom.config.set("core.disabledKeymaps", ['package-with-keymaps-manifest'])
+            expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])).toHaveLength 0
+
             atom.config.set("core.disabledKeymaps", [])
             expect(atom.keymaps.findKeyBindings(keystrokes: 'ctrl-z', target: element1[0])[0].command).toBe 'keymap-1'