diff --git a/new_session_test.go b/new_session_test.go
index 0c242029fd..3f8b7467f9 100644
--- a/new_session_test.go
+++ b/new_session_test.go
@@ -25,17 +25,20 @@ import (
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/executor"
 	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/mysql"
 	"github.com/pingcap/tidb/parser"
 	"github.com/pingcap/tidb/privilege/privileges"
 	"github.com/pingcap/tidb/sessionctx/variable"
 	"github.com/pingcap/tidb/store/tikv"
 	"github.com/pingcap/tidb/store/tikv/mock-tikv"
+	"github.com/pingcap/tidb/table/tables"
 	"github.com/pingcap/tidb/terror"
 	"github.com/pingcap/tidb/util/auth"
 	"github.com/pingcap/tidb/util/sqlexec"
 	"github.com/pingcap/tidb/util/testkit"
 	"github.com/pingcap/tidb/util/testleak"
+	"github.com/pingcap/tidb/util/types"
 )
 
 var _ = Suite(&testSessionSuite{})
@@ -799,6 +802,41 @@ func (s *testSessionSuite) TestIndexMaxLength(c *C) {
 	c.Assert(err, NotNil)
 }
 
+func (s *testSessionSuite) TestIndexColumnLength(c *C) {
+	tk := testkit.NewTestKitWithInit(c, s.store)
+	tk.MustExec("create table t (c1 int, c2 blob);")
+	tk.MustExec("create index idx_c1 on t(c1);")
+	tk.MustExec("create index idx_c2 on t(c2(6));")
+
+	is := s.dom.InfoSchema()
+	tab, err2 := is.TableByName(model.NewCIStr("test"), model.NewCIStr("t"))
+	c.Assert(err2, Equals, nil)
+
+	idxC1Cols := tables.FindIndexByColName(tab, "c1").Meta().Columns
+	c.Assert(idxC1Cols[0].Length, Equals, types.UnspecifiedLength)
+
+	idxC2Cols := tables.FindIndexByColName(tab, "c2").Meta().Columns
+	c.Assert(idxC2Cols[0].Length, Equals, 6)
+}
+
+func (s *testSessionSuite) TestIgnoreForeignKey(c *C) {
+	tk := testkit.NewTestKitWithInit(c, s.store)
+	sqlText := `CREATE TABLE address (
+		id bigint(20) NOT NULL AUTO_INCREMENT,
+		user_id bigint(20) NOT NULL,
+		PRIMARY KEY (id),
+		CONSTRAINT FK_7rod8a71yep5vxasb0ms3osbg FOREIGN KEY (user_id) REFERENCES waimaiqa.user (id),
+		INDEX FK_7rod8a71yep5vxasb0ms3osbg (user_id) comment ''
+		) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ROW_FORMAT=COMPACT COMMENT='' CHECKSUM=0 DELAY_KEY_WRITE=0;`
+	tk.MustExec(sqlText)
+}
+
+// TestISColumns tests information_schema.columns.
+func (s *testSessionSuite) TestISColumns(c *C) {
+	tk := testkit.NewTestKitWithInit(c, s.store)
+	tk.MustExec("select ORDINAL_POSITION from INFORMATION_SCHEMA.COLUMNS;")
+}
+
 var _ = Suite(&testSchemaSuite{})
 
 type testSchemaSuite struct {
diff --git a/session_test.go b/session_test.go
index f8d5fa024f..5658c2b576 100644
--- a/session_test.go
+++ b/session_test.go
@@ -22,13 +22,10 @@ import (
 	"github.com/pingcap/tidb/context"
 	"github.com/pingcap/tidb/domain"
 	"github.com/pingcap/tidb/kv"
-	"github.com/pingcap/tidb/model"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/store/localstore"
-	"github.com/pingcap/tidb/table/tables"
 	"github.com/pingcap/tidb/terror"
 	"github.com/pingcap/tidb/util/testleak"
-	"github.com/pingcap/tidb/util/types"
 )
 
 var (
@@ -889,55 +886,3 @@ func (s *test1435Suite) TestIssue1435(c *C) {
 	se2.Close()
 	localstore.MockRemoteStore = false
 }
-
-func (s *testSessionSuite) TestIndexColumnLength(c *C) {
-	defer testleak.AfterTest(c)()
-	dbName := "test_index_column_length"
-	dropDBSQL := fmt.Sprintf("drop database %s;", dbName)
-	se := newSession(c, s.store, dbName)
-	mustExecSQL(c, se, "drop table if exists t;")
-	mustExecSQL(c, se, "create table t (c1 int, c2 blob);")
-	mustExecSQL(c, se, "create index idx_c1 on t(c1);")
-	mustExecSQL(c, se, "create index idx_c2 on t(c2(6));")
-
-	is := s.dom.InfoSchema()
-	tab, err2 := is.TableByName(model.NewCIStr(dbName), model.NewCIStr("t"))
-	c.Assert(err2, Equals, nil)
-
-	idxC1Cols := tables.FindIndexByColName(tab, "c1").Meta().Columns
-	c.Assert(idxC1Cols[0].Length, Equals, types.UnspecifiedLength)
-
-	idxC2Cols := tables.FindIndexByColName(tab, "c2").Meta().Columns
-	c.Assert(idxC2Cols[0].Length, Equals, 6)
-
-	mustExecSQL(c, se, dropDBSQL)
-}
-
-func (s *testSessionSuite) TestIgnoreForeignKey(c *C) {
-	c.Skip("skip panic")
-	defer testleak.AfterTest(c)()
-	sqlText := `CREATE TABLE address (
-		id bigint(20) NOT NULL AUTO_INCREMENT,
-		user_id bigint(20) NOT NULL,
-		PRIMARY KEY (id),
-		CONSTRAINT FK_7rod8a71yep5vxasb0ms3osbg FOREIGN KEY (user_id) REFERENCES waimaiqa.user (id),
-		INDEX FK_7rod8a71yep5vxasb0ms3osbg (user_id) comment ''
-		) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci ROW_FORMAT=COMPACT COMMENT='' CHECKSUM=0 DELAY_KEY_WRITE=0;`
-	dbName := "test_ignore_foreignkey"
-	dropDBSQL := fmt.Sprintf("drop database %s;", dbName)
-	se := newSession(c, s.store, dbName)
-	mustExecSQL(c, se, sqlText)
-	mustExecSQL(c, se, dropDBSQL)
-}
-
-// TestISColumns tests information_schema.columns.
-func (s *testSessionSuite) TestISColumns(c *C) {
-	defer testleak.AfterTest(c)()
-	dbName := "test_is_columns"
-	dropDBSQL := fmt.Sprintf("drop database %s;", dbName)
-	se := newSession(c, s.store, dbName)
-	sql := "select ORDINAL_POSITION from INFORMATION_SCHEMA.COLUMNS;"
-	mustExecSQL(c, se, sql)
-
-	mustExecSQL(c, se, dropDBSQL)
-}