diff --git a/spec/atom-environment-spec.coffee b/spec/atom-environment-spec.coffee
index 2ba0164e6..5fd4b11f1 100644
--- a/spec/atom-environment-spec.coffee
+++ b/spec/atom-environment-spec.coffee
@@ -173,7 +173,7 @@ describe "AtomEnvironment", ->
       waitsForPromise ->
         atom.saveState().then ->
           atom.loadState().then (state) ->
-            expect(state).toBeNull()
+            expect(state).toBeFalsy()
 
       waitsForPromise ->
         loadSettings.initialPaths = [dir2, dir1]
@@ -188,15 +188,14 @@ describe "AtomEnvironment", ->
       loadSettings = _.extend(atom.getLoadSettings(), {initialPaths: [temp.mkdirSync("project-directory")]})
       spyOn(atom, 'getLoadSettings').andReturn(loadSettings)
       spyOn(atom, 'serialize').andReturn(serializedState)
-      spyOn(atom, 'getConfigDirPath').andReturn(temp.mkdirSync("config-directory"))
+      spyOn(atom, 'getStorageFolder').andReturn(new StorageFolder(temp.mkdirSync("config-directory")))
       atom.project.setPaths(atom.getLoadSettings().initialPaths)
 
       waitsForPromise ->
         atom.stateStore.connect()
 
       runs ->
-        storageFolder = new StorageFolder(atom.getConfigDirPath())
-        storageFolder.storeSync(atom.getStateKey(loadSettings.initialPaths), storageFolderState)
+        atom.getStorageFolder().storeSync(atom.getStateKey(loadSettings.initialPaths), storageFolderState)
 
       waitsForPromise ->
         atom.loadState().then (state) -> expect(state).toEqual(storageFolderState)