diff --git a/test/mock/mock_web_api_test.go b/test/mock/mock_web_api_test.go
index a621833db95d13571218c9dafab192debc428004..b1ecb828a6978e71742a43c7ad560b6809d897ee 100644
--- a/test/mock/mock_web_api_test.go
+++ b/test/mock/mock_web_api_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	// edb "github.com/eris-ltd/erisdb/erisdb"
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	"github.com/eris-ltd/eris-db/config"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
diff --git a/test/mock/pipe.go b/test/mock/pipe.go
index dfc032a4c0e478dacb7ffeb01d46078a3f7b3e91..7dd3bbc29a06852d9381888fb9ccb1ccb652afa7 100644
--- a/test/mock/pipe.go
+++ b/test/mock/pipe.go
@@ -1,7 +1,7 @@
 package mock
 
 import (
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 	td "github.com/eris-ltd/eris-db/test/testdata/testdata"
 	types "github.com/eris-ltd/eris-db/txs"
diff --git a/test/testdata/filters/testdata_filters.go b/test/testdata/filters/testdata_filters.go
index 6a3e6f3f7dea24940932c54ff4e9cc5a415b31a5..4e0e67abb73c16567f083a289d8ad8f9883c50c6 100644
--- a/test/testdata/filters/testdata_filters.go
+++ b/test/testdata/filters/testdata_filters.go
@@ -4,7 +4,7 @@ import (
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
 
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	"github.com/tendermint/tendermint/types"
 )
 
diff --git a/test/testdata/helpers.go b/test/testdata/helpers.go
index bd8fecf6c23f83b659ef66c74e33c45c3a692af2..5508a1ad11e9e0598cc2d871fc3bb25db1d19749 100644
--- a/test/testdata/helpers.go
+++ b/test/testdata/helpers.go
@@ -8,7 +8,7 @@ import (
 	"path"
 
 	. "github.com/tendermint/go-common"
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	"github.com/eris-ltd/eris-db/txs"
 	"github.com/tendermint/go-wire"
 )
diff --git a/test/testdata/testdata/testdata.go b/test/testdata/testdata/testdata.go
index d8e73531daa7f1c10d7f2f5c22babee8dc287380..b706422f2b5832880faa65a5c68c6d1b248ce0bc 100644
--- a/test/testdata/testdata/testdata.go
+++ b/test/testdata/testdata/testdata.go
@@ -1,10 +1,10 @@
 package testdata
 
 import (
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ep "github.com/eris-ltd/eris-db/erisdb/pipe"
-	stypes "github.com/eris-ltd/eris-db/state/types"
+	stypes "github.com/eris-ltd/eris-db/manager/eris-mint/state/types"
 	types "github.com/eris-ltd/eris-db/txs"
 
 	"github.com/tendermint/go-wire"
diff --git a/test/web_api/web_api_test.go b/test/web_api/web_api_test.go
index c1eaf57c3ff7fbff65bd16b6faa6d0230dc747cc..c5d6ccb1fd669f3bfab8b5bde6c176e3a3845466 100644
--- a/test/web_api/web_api_test.go
+++ b/test/web_api/web_api_test.go
@@ -12,7 +12,7 @@ import (
 	"path"
 	"testing"
 
-	"github.com/eris-ltd/eris-db/account"
+	"github.com/eris-ltd/eris-db/manager/eris-mint/account"
 	"github.com/eris-ltd/eris-db/config"
 	edb "github.com/eris-ltd/eris-db/erisdb"
 	ess "github.com/eris-ltd/eris-db/erisdb/erisdbss"