diff --git a/executor/BUILD.bazel b/executor/BUILD.bazel
index 3b1f49f447..75703fbd11 100644
--- a/executor/BUILD.bazel
+++ b/executor/BUILD.bazel
@@ -266,7 +266,6 @@ go_test(
     timeout = "moderate",
     srcs = [
         "adapter_test.go",
-        "admin_test.go",
         "aggregate_test.go",
         "analyze_test.go",
         "apply_cache_test.go",
@@ -311,7 +310,6 @@ go_test(
         "join_test.go",
         "joiner_test.go",
         "main_test.go",
-        "memory_test.go",
         "memtable_reader_test.go",
         "merge_join_test.go",
         "metrics_reader_test.go",
@@ -421,7 +419,6 @@ go_test(
         "//util/gcutil",
         "//util/hack",
         "//util/logutil",
-        "//util/logutil/consistency",
         "//util/mathutil",
         "//util/memory",
         "//util/mock",
@@ -464,7 +461,6 @@ go_test(
         "@org_golang_x_exp//slices",
         "@org_uber_go_atomic//:atomic",
         "@org_uber_go_goleak//:goleak",
-        "@org_uber_go_zap//:zap",
         "@org_uber_go_zap//zapcore",
     ],
 )
diff --git a/executor/admintest/BUILD.bazel b/executor/admintest/BUILD.bazel
new file mode 100644
index 0000000000..9f2cd187ac
--- /dev/null
+++ b/executor/admintest/BUILD.bazel
@@ -0,0 +1,38 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_test")
+
+go_test(
+    name = "admintest_test",
+    timeout = "short",
+    srcs = [
+        "admin_test.go",
+        "main_test.go",
+    ],
+    flaky = True,
+    shard_count = 23,
+    deps = [
+        "//config",
+        "//domain",
+        "//errno",
+        "//kv",
+        "//meta/autoid",
+        "//parser/model",
+        "//planner/core",
+        "//session",
+        "//sessionctx/stmtctx",
+        "//sessionctx/variable",
+        "//table",
+        "//table/tables",
+        "//testkit",
+        "//testkit/testsetup",
+        "//testkit/testutil",
+        "//types",
+        "//util/codec",
+        "//util/logutil/consistency",
+        "//util/mock",
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_stretchr_testify//require",
+        "@com_github_tikv_client_go_v2//tikv",
+        "@org_uber_go_goleak//:goleak",
+        "@org_uber_go_zap//:zap",
+    ],
+)
diff --git a/executor/admin_test.go b/executor/admintest/admin_test.go
similarity index 99%
rename from executor/admin_test.go
rename to executor/admintest/admin_test.go
index dac4ae074b..4c58cae402 100644
--- a/executor/admin_test.go
+++ b/executor/admintest/admin_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package executor_test
+package admintest
 
 import (
 	"context"
diff --git a/executor/admintest/main_test.go b/executor/admintest/main_test.go
new file mode 100644
index 0000000000..5d2985979b
--- /dev/null
+++ b/executor/admintest/main_test.go
@@ -0,0 +1,48 @@
+// Copyright 2023 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package admintest
+
+import (
+	"testing"
+
+	"github.com/pingcap/tidb/config"
+	"github.com/pingcap/tidb/meta/autoid"
+	"github.com/pingcap/tidb/testkit/testsetup"
+	"github.com/tikv/client-go/v2/tikv"
+	"go.uber.org/goleak"
+)
+
+func TestMain(m *testing.M) {
+	testsetup.SetupForCommonTest()
+	autoid.SetStep(5000)
+	config.UpdateGlobal(func(conf *config.Config) {
+		conf.Instance.SlowThreshold = 30000 // 30s
+		conf.TiKVClient.AsyncCommit.SafeWindow = 0
+		conf.TiKVClient.AsyncCommit.AllowedClockDrift = 0
+		conf.Experimental.AllowsExpressionIndex = true
+	})
+	tikv.EnableFailpoints()
+
+	opts := []goleak.Option{
+		goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
+		goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
+		goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
+		goleak.IgnoreTopFunction("gopkg.in/natefinch/lumberjack%2ev2.(*Logger).millRun"),
+		goleak.IgnoreTopFunction("github.com/tikv/client-go/v2/txnkv/transaction.keepAlive"),
+		goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
+	}
+
+	goleak.VerifyTestMain(m, opts...)
+}
diff --git a/executor/unstabletest/BUILD.bazel b/executor/unstabletest/BUILD.bazel
index c008cd6275..4f91dc7fbb 100644
--- a/executor/unstabletest/BUILD.bazel
+++ b/executor/unstabletest/BUILD.bazel
@@ -5,10 +5,11 @@ go_test(
     timeout = "short",
     srcs = [
         "main_test.go",
+        "memory_test.go",
         "unstable_test.go",
     ],
     flaky = True,
-    shard_count = 3,
+    shard_count = 4,
     deps = [
         "//config",
         "//meta/autoid",
diff --git a/executor/memory_test.go b/executor/unstabletest/memory_test.go
similarity index 99%
rename from executor/memory_test.go
rename to executor/unstabletest/memory_test.go
index 9fd147ba3d..6173f2bc2b 100644
--- a/executor/memory_test.go
+++ b/executor/unstabletest/memory_test.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package executor_test
+package unstabletest
 
 import (
 	"context"