diff --git a/state/main_test.go b/state/main_test.go
new file mode 100644
index 0000000000..973a7c3734
--- /dev/null
+++ b/state/main_test.go
@@ -0,0 +1,8 @@
+package state
+
+import (
+	checker "gopkg.in/check.v1"
+	"testing"
+)
+
+func Test(t *testing.T) { checker.TestingT(t) }
diff --git a/state/state_test.go b/state/state_test.go
index 9dd965e95a..8942f51ecd 100644
--- a/state/state_test.go
+++ b/state/state_test.go
@@ -1,34 +1,29 @@
 package state
 
 import (
-	. "gopkg.in/check.v1"
-	"testing"
+	checker "gopkg.in/check.v1"
 
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/ethutil"
 	"github.com/ethereum/go-ethereum/trie"
 )
 
-func Test(t *testing.T) { TestingT(t) }
-
 type StateSuite struct {
 	state *State
 }
 
-var _ = Suite(&StateSuite{})
-
-const expectedasbytes = "Expected % x Got % x"
+var _ = checker.Suite(&StateSuite{})
 
 // var ZeroHash256 = make([]byte, 32)
 
-func (s *StateSuite) SetUpTest(c *C) {
+func (s *StateSuite) SetUpTest(c *checker.C) {
 	db, _ := ethdb.NewMemDatabase()
 	ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "")
 	ethutil.Config.Db = db
 	s.state = New(trie.New(db, ""))
 }
 
-func (s *StateSuite) TestSnapshot(c *C) {
+func (s *StateSuite) TestSnapshot(c *checker.C) {
 	stateobjaddr := []byte("aa")
 	storageaddr := ethutil.Big("0")
 	data1 := ethutil.NewValue(42)
@@ -53,5 +48,5 @@ func (s *StateSuite) TestSnapshot(c *C) {
 	// get state storage value
 	res := stateObject.GetStorage(storageaddr)
 
-	c.Assert(data1, DeepEquals, res, Commentf(expectedasbytes, data1, res))
+	c.Assert(data1, checker.DeepEquals, res)
 }