diff --git a/package.json b/package.json
index 57d022a7..e56ff892 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,6 @@
     "err-code": "^2.0.0",
     "events": "^3.1.0",
     "hashlru": "^2.3.0",
-    "interface-datastore": "^1.0.4",
     "ipfs-utils": "^2.2.0",
     "it-all": "^1.0.1",
     "it-buffer": "^0.1.2",
@@ -88,10 +87,9 @@
     "chai-bytes": "^0.1.2",
     "chai-string": "^1.5.0",
     "cids": "^0.8.0",
-    "datastore-fs": "^1.1.0",
-    "datastore-level": "^1.1.0",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
+    "interface-datastore": "^1.0.4",
     "interop-libp2p": "^0.1.0",
     "ipfs-http-client": "^44.0.0",
     "it-concat": "^1.0.0",
diff --git a/test/keychain/cms-interop.spec.js b/test/keychain/cms-interop.spec.js
index 8eb19f6e..7a7f1ef9 100644
--- a/test/keychain/cms-interop.spec.js
+++ b/test/keychain/cms-interop.spec.js
@@ -7,12 +7,7 @@ const dirtyChai = require('dirty-chai')
 const expect = chai.expect
 chai.use(dirtyChai)
 chai.use(require('chai-string'))
-
-const os = require('os')
-const path = require('path')
-const { isNode } = require('ipfs-utils/src/env')
-const FsStore = require('datastore-fs')
-const LevelStore = require('datastore-level')
+const { MemoryDatastore } = require('interface-datastore')
 
 const Keychain = require('../../src/keychain')
 
@@ -22,9 +17,7 @@ describe('cms interop', () => {
   let ks
 
   before(() => {
-    const datastore = isNode
-      ? new FsStore(path.join(os.tmpdir(), 'test-keystore-1-' + Date.now()))
-      : new LevelStore('test-keystore-1', { db: require('level') })
+    const datastore = new MemoryDatastore()
     ks = new Keychain(datastore, { passPhrase: passPhrase })
   })
 
diff --git a/test/keychain/keychain.spec.js b/test/keychain/keychain.spec.js
index 0451cd37..20380d52 100644
--- a/test/keychain/keychain.spec.js
+++ b/test/keychain/keychain.spec.js
@@ -5,17 +5,11 @@
 const { chai, expect } = require('aegir/utils/chai')
 const fail = expect.fail
 chai.use(require('chai-string'))
+const { MemoryDatastore } = require('interface-datastore')
+const PeerId = require('peer-id')
 
 const peerUtils = require('../utils/creators/peer')
-
-const os = require('os')
-const path = require('path')
-const { isNode } = require('ipfs-utils/src/env')
-const { MemoryDatastore } = require('interface-datastore')
-const FsStore = require('datastore-fs')
-const LevelStore = require('datastore-level')
 const Keychain = require('../../src/keychain')
-const PeerId = require('peer-id')
 
 describe('keychain', () => {
   const passPhrase = 'this is not a secure phrase'
@@ -27,12 +21,8 @@ describe('keychain', () => {
   let datastore1, datastore2
 
   before(() => {
-    datastore1 = isNode
-      ? new FsStore(path.join(os.tmpdir(), 'test-keystore-1-' + Date.now()))
-      : new LevelStore('test-keystore-1', { db: require('level') })
-    datastore2 = isNode
-      ? new FsStore(path.join(os.tmpdir(), 'test-keystore-2-' + Date.now()))
-      : new LevelStore('test-keystore-2', { db: require('level') })
+    datastore1 = new MemoryDatastore()
+    datastore2 = new MemoryDatastore()
 
     ks = new Keychain(datastore2, { passPhrase: passPhrase })
     emptyKeystore = new Keychain(datastore1, { passPhrase: passPhrase })
@@ -71,12 +61,12 @@ describe('keychain', () => {
 
   it('can find a key without a password', async () => {
     const keychain = new Keychain(datastore2)
-    const keychainWithPassword = new Keychain(datastore2, { passPhrase: `hello-${Date.now()}-${Date.now()}` })
     const id = `key-${Math.random()}`
 
-    await keychainWithPassword.createKey(id, 'rsa', 2048)
+    const key = await keychain.createKey(id, 'rsa', 2048)
+    const foundKey = await keychain.findKeyById(key.id)
 
-    await expect(keychain.findKeyById(id)).to.eventually.be.ok()
+    await expect(key.id).to.equal(foundKey.id)
   })
 
   it('can remove a key without a password', async () => {