diff --git a/server/tidb_test.go b/server/tidb_test.go
index 8ea521fda6275..1b8941c34a49f 100644
--- a/server/tidb_test.go
+++ b/server/tidb_test.go
@@ -95,15 +95,15 @@ func createTidbTestSuite(t *testing.T) (*tidbTestSuite, func()) {
 	ts.waitUntilServerOnline()
 
 	cleanup := func() {
-		if ts.store != nil {
-			ts.store.Close()
-		}
 		if ts.domain != nil {
 			ts.domain.Close()
 		}
 		if ts.server != nil {
 			ts.server.Close()
 		}
+		if ts.store != nil {
+			require.NoError(t, ts.store.Close())
+		}
 	}
 
 	return ts, cleanup