2 files changed, 12 insertions, 0 deletions
diff --git a/test/integration/lib/keyring-controller-test.js b/test/integration/lib/keyring-controller-test.js
index bea485270..678744834 100644
--- a/test/integration/lib/keyring-controller-test.js
+++ b/test/integration/lib/keyring-controller-test.js
@@ -44,3 +44,14 @@ QUnit.test('keyringController:submitPassword', function (assert) {
     done()
   })
 })
+
+QUnit.test('keyringController:setLocked', function (assert) {
+  var done = assert.async()
+  var self = this
+
+  this.keyringController.setLocked(function(err) {
+    assert.notOk(self.keyringController.password, 'password should be deallocated')
+    assert.deepEqual(self.keyringController.keyrings, [], 'keyrings should be deallocated')
+    done()
+  })
+})
diff --git a/test/unit/keyring-controller-test.js b/test/unit/keyring-controller-test.js
index a58043c7a..b20def02e 100644
--- a/test/unit/keyring-controller-test.js
+++ b/test/unit/keyring-controller-test.js
@@ -87,6 +87,7 @@ describe('KeyringController', function() {
       keyringController.migrateOldVaultIfAny(password)
       .then(() => {
         assert(keyringController.configManager.getVault(), 'now has a vault')
+        assert(keyringController.password, 'has a password set')
         done()
       })
       .catch((reason) => {