diff --git a/tidb-server/BUILD.bazel b/tidb-server/BUILD.bazel
index 666991b7aced2..b918b7e1ca5f8 100644
--- a/tidb-server/BUILD.bazel
+++ b/tidb-server/BUILD.bazel
@@ -70,12 +70,31 @@ go_binary(
     name = "tidb-server",
     embed = [":tidb-server_lib"],
     visibility = ["//visibility:public"],
+    x_defs = {
+        "github.com/pingcap/tidb/parser/mysql.TiDBReleaseVersion": "{STABLE_TiDB_RELEASE_VERSION}",
+        "github.com/pingcap/tidb/util/versioninfo.TiDBBuildTS": "{STABLE_TiDB_BUILD_UTCTIME}",
+        "github.com/pingcap/tidb/util/versioninfo.TiDBGitHash": "{STABLE_TIDB_GIT_HASH}",
+        "github.com/pingcap/tidb/util/versioninfo.TiDBGitBranch": "{STABLE_TIDB_GIT_BRANCH}",
+        "github.com/pingcap/tidb/util/versioninfo.TiDBEdition": "{STABLE_TIDB_EDITION}",
+    },
+)
+
+go_binary(
+    name = "tidb-server-check",
+    embed = [":tidb-server_lib"],
+    gc_linkopts = [
+        "-X",
+        "github.com/pingcap/tidb/config.checkBeforeDropLDFlag=1",
+    ],
+    visibility = ["//visibility:public"],
 )
 
 go_test(
     name = "tidb-server_test",
+    timeout = "short",
     srcs = ["main_test.go"],
     embed = [":tidb-server_lib"],
+    flaky = True,
     deps = [
         "//config",
         "//parser/mysql",