diff --git a/importer/importer_test.go b/importer/importer_test.go
index f730874ec..43c59ceb0 100644
--- a/importer/importer_test.go
+++ b/importer/importer_test.go
@@ -137,8 +137,8 @@ type dagservAndPinner struct {
 }
 
 func getDagservAndPinner(t *testing.T) dagservAndPinner {
-	db := ds.NewMapDatastore()
-	bs := bstore.NewBlockstore(dssync.MutexWrap(db))
+	db := dssync.MutexWrap(ds.NewMapDatastore())
+	bs := bstore.NewBlockstore(db)
 	blockserv, err := bserv.New(bs, offline.Exchange(bs))
 	if err != nil {
 		t.Fatal(err)
diff --git a/merkledag/merkledag_test.go b/merkledag/merkledag_test.go
index e44870b8c..9dbfad454 100644
--- a/merkledag/merkledag_test.go
+++ b/merkledag/merkledag_test.go
@@ -28,8 +28,8 @@ type dagservAndPinner struct {
 }
 
 func getDagservAndPinner(t *testing.T) dagservAndPinner {
-	db := ds.NewMapDatastore()
-	bs := bstore.NewBlockstore(dssync.MutexWrap(db))
+	db := dssync.MutexWrap(ds.NewMapDatastore())
+	bs := bstore.NewBlockstore(db)
 	blockserv, err := bserv.New(bs, offline.Exchange(bs))
 	if err != nil {
 		t.Fatal(err)
diff --git a/pin/pin.go b/pin/pin.go
index 371497da6..32b85a9d7 100644
--- a/pin/pin.go
+++ b/pin/pin.go
@@ -53,11 +53,11 @@ type pinner struct {
 	directPin  set.BlockSet
 	indirPin   *indirectPin
 	dserv      mdag.DAGService
-	dstore     ds.Datastore
+	dstore     ds.ThreadSafeDatastore
 }
 
 // NewPinner creates a new pinner using the given datastore as a backend
-func NewPinner(dstore ds.Datastore, serv mdag.DAGService) Pinner {
+func NewPinner(dstore ds.ThreadSafeDatastore, serv mdag.DAGService) Pinner {
 
 	// Load set from given datastore...
 	rcds := nsds.Wrap(dstore, recursePinDatastoreKey)
@@ -176,7 +176,7 @@ func (p *pinner) IsPinned(key util.Key) bool {
 }
 
 // LoadPinner loads a pinner and its keysets from the given datastore
-func LoadPinner(d ds.Datastore, dserv mdag.DAGService) (Pinner, error) {
+func LoadPinner(d ds.ThreadSafeDatastore, dserv mdag.DAGService) (Pinner, error) {
 	p := new(pinner)
 
 	{ // load recursive set
diff --git a/pin/pin_test.go b/pin/pin_test.go
index dada99803..623983a34 100644
--- a/pin/pin_test.go
+++ b/pin/pin_test.go
@@ -21,8 +21,8 @@ func randNode() (*mdag.Node, util.Key) {
 }
 
 func TestPinnerBasic(t *testing.T) {
-	dstore := ds.NewMapDatastore()
-	bstore := blockstore.NewBlockstore(dssync.MutexWrap(dstore))
+	dstore := dssync.MutexWrap(ds.NewMapDatastore())
+	bstore := blockstore.NewBlockstore(dstore)
 	bserv, err := bs.New(bstore, offline.Exchange(bstore))
 	if err != nil {
 		t.Fatal(err)