diff --git a/red/settings.js b/red/settings.js
index 4921e7c4d..4994953f1 100644
--- a/red/settings.js
+++ b/red/settings.js
@@ -60,8 +60,8 @@ var persistentSettings = {
         if (globalSettings === null) {
             throw new Error("Settings not available");
         }
+        var current = globalSettings[prop];
         globalSettings[prop] = value;
-        var current = persistentSettings.get(prop);
         try {
             assert.deepEqual(current,value);
             return when.resolve();
@@ -72,6 +72,12 @@ var persistentSettings = {
     
     available: function() {
         return (globalSettings !== null);
+    },
+    
+    reset: function() {
+        userSettings = null;
+        globalSettings = null;
+        storage = null;
     }
 }
 
diff --git a/test/red/settings_spec.js b/test/red/settings_spec.js
index 40553ab19..fb4cbade6 100644
--- a/test/red/settings_spec.js
+++ b/test/red/settings_spec.js
@@ -20,6 +20,11 @@ var settings = require("../../red/settings");
 
 
 describe("red/settings", function() {
+        
+    afterEach(function() {
+        settings.reset();
+    });
+    
     it('wraps the user settings as read-only properties', function() {
         var userSettings = {
             a: 123,