diff --git a/ipfscluster_test.go b/ipfscluster_test.go
index effb4f0e..242a9864 100644
--- a/ipfscluster_test.go
+++ b/ipfscluster_test.go
@@ -136,7 +136,9 @@ func randomBytes() []byte {
 
 func createComponents(t *testing.T, host host.Host, pubsub *pubsub.PubSub, dht *dht.IpfsDHT, i int, staging bool) (*Config, ds.Datastore, Consensus, []API, IPFSConnector, PinTracker, PeerMonitor, PinAllocator, Informer, Tracer, *test.IpfsMock) {
 	ctx := context.Background()
-	mock := test.NewIpfsMock(t)
+	peername := fmt.Sprintf("peer_%d", i)
+
+	mock := test.NewIpfsMock(t, peername)
 
 	//apiAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/%d", apiPort+i))
 	// Bind on port 0
@@ -146,8 +148,6 @@ func createComponents(t *testing.T, host host.Host, pubsub *pubsub.PubSub, dht *
 	proxyAddr, _ := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/0")
 	nodeAddr, _ := ma.NewMultiaddr(fmt.Sprintf("/ip4/%s/tcp/%d", mock.Addr, mock.Port))
 
-	peername := fmt.Sprintf("peer_%d", i)
-
 	clusterCfg, apiCfg, ipfsproxyCfg, ipfshttpCfg, badgerCfg, raftCfg, crdtCfg, maptrackerCfg, statelesstrackerCfg, psmonCfg, diskInfCfg, tracingCfg := testingConfigs()
 
 	clusterCfg.ID = host.ID()
diff --git a/test/ipfs_mock.go b/test/ipfs_mock.go
index 01e70bdd..36b4b9b4 100644
--- a/test/ipfs_mock.go
+++ b/test/ipfs_mock.go
@@ -98,9 +98,9 @@ type mockBlockPutResp struct {
 }
 
 // NewIpfsMock returns a new mock.
-func NewIpfsMock(t *testing.T) *IpfsMock {
+func NewIpfsMock(t *testing.T, ns string) *IpfsMock {
 	store := inmem.New()
-	st, err := dsstate.New(store, "", dsstate.DefaultHandle())
+	st, err := dsstate.New(store, ns, dsstate.DefaultHandle())
 	if err != nil {
 		t.Fatal(err)
 	}