diff --git a/util/kvencoder/kv_encoder_test.go b/util/kvencoder/kv_encoder_test.go
index 658d15c2725fb..27c9c40ea408e 100644
--- a/util/kvencoder/kv_encoder_test.go
+++ b/util/kvencoder/kv_encoder_test.go
@@ -49,6 +49,7 @@ func newStoreWithBootstrap() (kv.Storage, *domain.Domain, error) {
 		return nil, nil, errors.Trace(err)
 	}
 	session.SetSchemaLease(0)
+	session.SetStatsLease(0)
 	dom, err := session.BootstrapSession(store)
 	return store, dom, errors.Trace(err)
 }
diff --git a/util/timeutil/time.go b/util/timeutil/time.go
index e3527238a1a23..5ebdf1212b142 100644
--- a/util/timeutil/time.go
+++ b/util/timeutil/time.go
@@ -117,9 +117,13 @@ func SystemLocation() *time.Location {
 	return loc
 }
 
+var setSysTZOnce sync.Once
+
 // SetSystemTZ sets systemTZ by the value loaded from mysql.tidb.
 func SetSystemTZ(name string) {
-	systemTZ = name
+	setSysTZOnce.Do(func() {
+		systemTZ = name
+	})
 }
 
 // getLoc first trying to load location from a cache map. If nothing found in such map, then call