diff --git a/action_test.go b/action_test.go
index a138e2b..525ae71 100644
--- a/action_test.go
+++ b/action_test.go
@@ -39,7 +39,7 @@ type ActionTestSuit struct {
 
 var _ = Suite(&ActionTestSuit{})
 
-func (s *ActionTestSuit) SetUpTest(c *C) {
+func (s *ActionTestSuit) SetUpSuite(c *C) {
 	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
@@ -48,10 +48,13 @@ func (s *ActionTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := NewColumnFamilyDescriptor("cf")
 	tblDesc.AddColumnDesc(cf)
-	s.cli.CreateTable(tblDesc, nil)
+	err = s.cli.CreateTable(tblDesc, nil)
+	c.Assert(err, IsNil)
 }
 
-func (s *ActionTestSuit) TearDownTest(c *C) {
+func (s *ActionTestSuit) TearDownSuite(c *C) {
+	c.Assert(s.cli, NotNil)
+
 	err := s.cli.DisableTable(s.tableName)
 	c.Assert(err, IsNil)
 
diff --git a/admin_test.go b/admin_test.go
index 9a94bee..c5a3a6a 100644
--- a/admin_test.go
+++ b/admin_test.go
@@ -31,17 +31,23 @@ func getTestZkHosts() []string {
 
 var _ = Suite(&AdminTestSuit{})
 
-func (s *AdminTestSuit) SetUpTest(c *C) {
+func (s *AdminTestSuit) SetUpSuite(c *C) {
 	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
 
 	s.tableName = "test_admin"
 	s.invalidTableName = "test_admin_xxx"
+}
+
+func (s *AdminTestSuit) TearDownSuite(c *C) {
+}
+
+func (s *AdminTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := NewColumnFamilyDescriptor("cf")
 	tblDesc.AddColumnDesc(cf)
-	err = s.cli.CreateTable(tblDesc, [][]byte{[]byte("f"), []byte("e"), []byte("c")})
+	err := s.cli.CreateTable(tblDesc, [][]byte{[]byte("f"), []byte("e"), []byte("c")})
 	c.Assert(err, IsNil)
 }
 
diff --git a/del_test.go b/del_test.go
index fc3b6e1..4888ba0 100644
--- a/del_test.go
+++ b/del_test.go
@@ -5,27 +5,33 @@ import (
 	"github.com/pingcap/go-hbase/proto"
 )
 
-type HBaseDelTestSuit struct {
+type DelTestSuit struct {
 	cli       HBaseClient
 	tableName string
 }
 
-var _ = Suite(&HBaseDelTestSuit{})
+var _ = Suite(&DelTestSuit{})
 
-func (s *HBaseDelTestSuit) SetUpTest(c *C) {
+func (s *DelTestSuit) SetUpSuite(c *C) {
 	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
 
-	s.tableName = "t2"
+	s.tableName = "test_del"
+}
+
+func (s *DelTestSuit) TearDownSuite(c *C) {
+}
+
+func (s *DelTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := NewColumnFamilyDescriptor("cf")
 	tblDesc.AddColumnDesc(cf)
-	err = s.cli.CreateTable(tblDesc, nil)
+	err := s.cli.CreateTable(tblDesc, nil)
 	c.Assert(err, IsNil)
 }
 
-func (s *HBaseDelTestSuit) TearDownTest(c *C) {
+func (s *DelTestSuit) TearDownTest(c *C) {
 	err := s.cli.DisableTable(s.tableName)
 	c.Assert(err, IsNil)
 
@@ -33,7 +39,7 @@ func (s *HBaseDelTestSuit) TearDownTest(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *HBaseDelTestSuit) TestDel(c *C) {
+func (s *DelTestSuit) TestDel(c *C) {
 	d := NewDelete([]byte("hello"))
 	d.AddFamily([]byte("cf"))
 	d.AddFamily([]byte("cf1"))
@@ -67,7 +73,7 @@ func (s *HBaseDelTestSuit) TestDel(c *C) {
 	}
 }
 
-func (s *HBaseDelTestSuit) TestDelWithClient(c *C) {
+func (s *DelTestSuit) TestDelWithClient(c *C) {
 	// Test put a new value.
 	p := NewPut([]byte("test"))
 	p.AddValue([]byte("cf"), []byte("q"), []byte("val"))
diff --git a/get_test.go b/get_test.go
index 1e22e92..ddfabe4 100644
--- a/get_test.go
+++ b/get_test.go
@@ -10,27 +10,33 @@ import (
 	"github.com/pingcap/go-hbase/proto"
 )
 
-type HBaseGetTestSuit struct {
+type GetTestSuit struct {
 	cli       HBaseClient
 	tableName string
 }
 
-var _ = Suite(&HBaseGetTestSuit{})
+var _ = Suite(&GetTestSuit{})
 
-func (s *HBaseGetTestSuit) SetUpTest(c *C) {
+func (s *GetTestSuit) SetUpSuite(c *C) {
 	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
 
-	s.tableName = "t1"
+	s.tableName = "test_get"
+}
+
+func (s *GetTestSuit) TearDownSuite(c *C) {
+}
+
+func (s *GetTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := NewColumnFamilyDescriptor("cf")
 	tblDesc.AddColumnDesc(cf)
-	err = s.cli.CreateTable(tblDesc, nil)
+	err := s.cli.CreateTable(tblDesc, nil)
 	c.Assert(err, IsNil)
 }
 
-func (s *HBaseGetTestSuit) TearDownTest(c *C) {
+func (s *GetTestSuit) TearDownTest(c *C) {
 	err := s.cli.DisableTable(s.tableName)
 	c.Assert(err, IsNil)
 
@@ -38,7 +44,7 @@ func (s *HBaseGetTestSuit) TearDownTest(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *HBaseGetTestSuit) TestGet(c *C) {
+func (s *GetTestSuit) TestGet(c *C) {
 	g := NewGet([]byte("row"))
 	g.AddFamily([]byte("cf"))
 	g.AddColumn([]byte("cf"), []byte("c"))
@@ -59,19 +65,19 @@ func (s *HBaseGetTestSuit) TestGet(c *C) {
 	}
 }
 
-func (s *HBaseGetTestSuit) TestGetWithClient(c *C) {
+func (s *GetTestSuit) TestGetWithClient(c *C) {
 	// get item not exists
 	g := NewGet([]byte("nosuchrow"))
 	r, err := s.cli.Get("nosuchtable", g)
 	c.Assert(err, NotNil)
 	c.Assert(r, IsNil)
 
-	r, err = s.cli.Get("t1", g)
+	r, err = s.cli.Get(s.tableName, g)
 	c.Assert(r, IsNil)
 	c.Assert(err, IsNil)
 }
 
-func (s *HBaseGetTestSuit) TestConcurrentGet(c *C) {
+func (s *GetTestSuit) TestConcurrentGet(c *C) {
 	runtime.GOMAXPROCS(runtime.NumCPU())
 	wg := sync.WaitGroup{}
 	for i := 0; i < 100; i++ {
diff --git a/put_test.go b/put_test.go
index 1f31319..4eddb8b 100644
--- a/put_test.go
+++ b/put_test.go
@@ -7,27 +7,33 @@ import (
 	"github.com/pingcap/go-hbase/proto"
 )
 
-type HBasePutTestSuit struct {
+type PutTestSuit struct {
 	cli       HBaseClient
 	tableName string
 }
 
-var _ = Suite(&HBasePutTestSuit{})
+var _ = Suite(&PutTestSuit{})
 
-func (s *HBasePutTestSuit) SetUpTest(c *C) {
+func (s *PutTestSuit) SetUpSuite(c *C) {
 	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
 
-	s.tableName = "t2"
+	s.tableName = "test_put"
+}
+
+func (s *PutTestSuit) TearDownSuite(c *C) {
+}
+
+func (s *PutTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := NewColumnFamilyDescriptor("cf")
 	tblDesc.AddColumnDesc(cf)
-	err = s.cli.CreateTable(tblDesc, nil)
+	err := s.cli.CreateTable(tblDesc, nil)
 	c.Assert(err, IsNil)
 }
 
-func (s *HBasePutTestSuit) TearDownTest(c *C) {
+func (s *PutTestSuit) TearDownTest(c *C) {
 	err := s.cli.DisableTable(s.tableName)
 	c.Assert(err, IsNil)
 
@@ -35,7 +41,7 @@ func (s *HBasePutTestSuit) TearDownTest(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *HBasePutTestSuit) TestPut(c *C) {
+func (s *PutTestSuit) TestPut(c *C) {
 	g := NewPut([]byte("row"))
 	g.AddValue([]byte("cf"), []byte("q"), []byte("val"))
 	msg := g.ToProto()
@@ -51,7 +57,7 @@ func (s *HBasePutTestSuit) TestPut(c *C) {
 	}
 }
 
-func (s *HBasePutTestSuit) TestGetPut(c *C) {
+func (s *PutTestSuit) TestGetPut(c *C) {
 	p := NewPut([]byte("1_\xff\xff"))
 	p2 := NewPut([]byte("1_\xff\xfe"))
 	p3 := NewPut([]byte("1_\xff\xee"))
diff --git a/scan_test.go b/scan_test.go
index 790ae24..1a65c69 100644
--- a/scan_test.go
+++ b/scan_test.go
@@ -16,19 +16,23 @@ type ScanTestSuit struct {
 
 var _ = Suite(&ScanTestSuit{})
 
-func (s *ScanTestSuit) SetUpTest(c *C) {
-	var (
-		err error
-	)
-
+func (s *ScanTestSuit) SetUpSuite(c *C) {
+	var err error
 	s.cli, err = NewClient(getTestZkHosts(), "/hbase")
 	c.Assert(err, IsNil)
 
 	s.tableName = "test_scan"
+}
+
+func (s *ScanTestSuit) TearDownSuite(c *C) {
+}
+
+func (s *ScanTestSuit) SetUpTest(c *C) {
 	tblDesc := NewTableDesciptor(s.tableName)
 	cf := newColumnFamilyDescriptor("cf", 3)
 	tblDesc.AddColumnDesc(cf)
-	s.cli.CreateTable(tblDesc, nil)
+	err := s.cli.CreateTable(tblDesc, nil)
+	c.Assert(err, IsNil)
 }
 
 func (s *ScanTestSuit) TearDownTest(c *C) {
@@ -367,6 +371,7 @@ func (s *ScanTestSuit) TestScanClose(c *C) {
 		c.Assert(ok, IsTrue)
 		c.Assert(err, IsNil)
 	}
+
 	// Do not get any data.
 	scan := NewScan([]byte(s.tableName), 100, s.cli)
 	err := scan.Close()
@@ -378,6 +383,7 @@ func (s *ScanTestSuit) TestScanClose(c *C) {
 	scan = NewScan([]byte(s.tableName), 100, s.cli)
 	r = scan.Next()
 	c.Assert(r, NotNil)
+
 	// If scanner Close, then do not fetch any data even cache still has some.
 	err = scan.Close()
 	c.Assert(err, IsNil)