diff --git a/cmd/pd-server/main.go b/cmd/pd-server/main.go
index f7e3c32851c..ee82902163e 100644
--- a/cmd/pd-server/main.go
+++ b/cmd/pd-server/main.go
@@ -50,7 +50,7 @@ import (
 )
 
 const (
-	apiMode        = "api"
+	keyspaceMode   = "api"
 	tsoMode        = "tso"
 	serviceModeEnv = "PD_SERVICE_MODE"
 )
@@ -80,7 +80,7 @@ func NewServiceCommand() *cobra.Command {
 	}
 	cmd.AddCommand(NewTSOServiceCommand())
 	cmd.AddCommand(NewSchedulingServiceCommand())
-	cmd.AddCommand(NewAPIServiceCommand())
+	cmd.AddCommand(NewPDWithKeyspaceCommand())
 	return cmd
 }
 
@@ -126,12 +126,12 @@ func NewSchedulingServiceCommand() *cobra.Command {
 	return cmd
 }
 
-// NewAPIServiceCommand returns the API service command.
-func NewAPIServiceCommand() *cobra.Command {
+// NewPDWithKeyspaceCommand returns the PD with keyspace command.
+func NewPDWithKeyspaceCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   apiMode,
-		Short: "Run the API service",
-		Run:   createAPIServerWrapper,
+		Use:   keyspaceMode,
+		Short: "Placement Driver server with keyspace",
+		Run:   createServerWrapperWithKeyspace,
 	}
 	addFlags(cmd)
 	return cmd
@@ -158,14 +158,14 @@ func addFlags(cmd *cobra.Command) {
 	cmd.Flags().BoolP("force-new-cluster", "", false, "force to create a new one-member cluster")
 }
 
-func createAPIServerWrapper(cmd *cobra.Command, args []string) {
+func createServerWrapperWithKeyspace(cmd *cobra.Command, args []string) {
 	start(cmd, args, cmd.CalledAs())
 }
 
 func createServerWrapper(cmd *cobra.Command, args []string) {
 	mode := os.Getenv(serviceModeEnv)
-	if len(mode) != 0 && strings.ToLower(mode) == apiMode {
-		start(cmd, args, apiMode)
+	if len(mode) != 0 && strings.ToLower(mode) == keyspaceMode {
+		start(cmd, args, keyspaceMode)
 	} else {
 		start(cmd, args)
 	}
diff --git a/tests/cluster.go b/tests/cluster.go
index bf17f79a87c..2fb55943dd8 100644
--- a/tests/cluster.go
+++ b/tests/cluster.go
@@ -81,8 +81,8 @@ func NewTestServer(ctx context.Context, cfg *config.Config) (*TestServer, error)
 	return createTestServer(ctx, cfg, nil)
 }
 
-// NewTestAPIServer creates a new TestServer.
-func NewTestAPIServer(ctx context.Context, cfg *config.Config) (*TestServer, error) {
+// NewTestServerWithKeyspace creates a new TestServer.
+func NewTestServerWithKeyspace(ctx context.Context, cfg *config.Config) (*TestServer, error) {
 	return createTestServer(ctx, cfg, []string{constant.APIServiceName})
 }
 
@@ -441,12 +441,12 @@ func NewTestCluster(ctx context.Context, initialServerCount int, opts ...ConfigO
 	return createTestCluster(ctx, initialServerCount, false, opts...)
 }
 
-// NewTestAPICluster creates a new TestCluster with API service.
-func NewTestAPICluster(ctx context.Context, initialServerCount int, opts ...ConfigOption) (*TestCluster, error) {
+// NewTestClusterWithKeyspace creates a new TestCluster with keyspace.
+func NewTestClusterWithKeyspace(ctx context.Context, initialServerCount int, opts ...ConfigOption) (*TestCluster, error) {
 	return createTestCluster(ctx, initialServerCount, true, opts...)
 }
 
-func createTestCluster(ctx context.Context, initialServerCount int, isAPIServiceMode bool, opts ...ConfigOption) (*TestCluster, error) {
+func createTestCluster(ctx context.Context, initialServerCount int, isKeyspaceEnabled bool, opts ...ConfigOption) (*TestCluster, error) {
 	schedulers.Register()
 	config := newClusterConfig(initialServerCount)
 	servers := make(map[string]*TestServer)
@@ -456,8 +456,8 @@ func createTestCluster(ctx context.Context, initialServerCount int, isAPIService
 			return nil, err
 		}
 		var s *TestServer
-		if isAPIServiceMode {
-			s, err = NewTestAPIServer(ctx, serverConf)
+		if isKeyspaceEnabled {
+			s, err = NewTestServerWithKeyspace(ctx, serverConf)
 		} else {
 			s, err = NewTestServer(ctx, serverConf)
 		}
@@ -484,7 +484,7 @@ func RestartTestAPICluster(ctx context.Context, cluster *TestCluster) (*TestClus
 }
 
 func restartTestCluster(
-	ctx context.Context, cluster *TestCluster, isAPIServiceMode bool,
+	ctx context.Context, cluster *TestCluster, isKeyspaceEnabled bool,
 ) (newTestCluster *TestCluster, err error) {
 	schedulers.Register()
 	newTestCluster = &TestCluster{
@@ -511,8 +511,8 @@ func restartTestCluster(
 				newServer *TestServer
 				serverErr error
 			)
-			if isAPIServiceMode {
-				newServer, serverErr = NewTestAPIServer(ctx, serverCfg)
+			if isKeyspaceEnabled {
+				newServer, serverErr = NewTestServerWithKeyspace(ctx, serverCfg)
 			} else {
 				newServer, serverErr = NewTestServer(ctx, serverCfg)
 			}
@@ -746,13 +746,13 @@ func (c *TestCluster) Join(ctx context.Context, opts ...ConfigOption) (*TestServ
 	return s, nil
 }
 
-// JoinAPIServer is used to add a new TestAPIServer into the cluster.
-func (c *TestCluster) JoinAPIServer(ctx context.Context, opts ...ConfigOption) (*TestServer, error) {
+// JoinServerWithKeyspace is used to add a new TestServerWithKeyspace into the cluster.
+func (c *TestCluster) JoinServerWithKeyspace(ctx context.Context, opts ...ConfigOption) (*TestServer, error) {
 	conf, err := c.config.join().Generate(opts...)
 	if err != nil {
 		return nil, err
 	}
-	s, err := NewTestAPIServer(ctx, conf)
+	s, err := NewTestServerWithKeyspace(ctx, conf)
 	if err != nil {
 		return nil, err
 	}
diff --git a/tests/integrations/client/client_test.go b/tests/integrations/client/client_test.go
index 3568b1701e9..7855c0b1274 100644
--- a/tests/integrations/client/client_test.go
+++ b/tests/integrations/client/client_test.go
@@ -328,7 +328,7 @@ func TestTSOFollowerProxyWithTSOService(t *testing.T) {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/client/servicediscovery/fastUpdateServiceMode", `return(true)`))
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	cluster, err := tests.NewTestAPICluster(ctx, 1)
+	cluster, err := tests.NewTestClusterWithKeyspace(ctx, 1)
 	re.NoError(err)
 	defer cluster.Destroy()
 	err = cluster.RunInitialServers()
diff --git a/tests/integrations/mcs/discovery/register_test.go b/tests/integrations/mcs/discovery/register_test.go
index 147e16530b7..8cf5acd1918 100644
--- a/tests/integrations/mcs/discovery/register_test.go
+++ b/tests/integrations/mcs/discovery/register_test.go
@@ -53,7 +53,7 @@ func (suite *serverRegisterTestSuite) SetupSuite() {
 	re := suite.Require()
 
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
diff --git a/tests/integrations/mcs/keyspace/tso_keyspace_group_test.go b/tests/integrations/mcs/keyspace/tso_keyspace_group_test.go
index c6b6070fda5..183102455b3 100644
--- a/tests/integrations/mcs/keyspace/tso_keyspace_group_test.go
+++ b/tests/integrations/mcs/keyspace/tso_keyspace_group_test.go
@@ -58,7 +58,7 @@ func (suite *keyspaceGroupTestSuite) SetupTest() {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/keyspace/acceleratedAllocNodes", `return(true)`))
 	ctx, cancel := context.WithCancel(context.Background())
 	suite.ctx = ctx
-	cluster, err := tests.NewTestAPICluster(suite.ctx, 1)
+	cluster, err := tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	suite.cluster = cluster
 	re.NoError(err)
 	re.NoError(cluster.RunInitialServers())
diff --git a/tests/integrations/mcs/members/member_test.go b/tests/integrations/mcs/members/member_test.go
index e1953de4e62..c3f6d13e2de 100644
--- a/tests/integrations/mcs/members/member_test.go
+++ b/tests/integrations/mcs/members/member_test.go
@@ -62,7 +62,7 @@ func (suite *memberTestSuite) SetupTest() {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/keyspace/acceleratedAllocNodes", `return(true)`))
 	ctx, cancel := context.WithCancel(context.Background())
 	suite.ctx = ctx
-	cluster, err := tests.NewTestAPICluster(suite.ctx, 1)
+	cluster, err := tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	suite.cluster = cluster
 	re.NoError(err)
 	re.NoError(cluster.RunInitialServers())
diff --git a/tests/integrations/mcs/resourcemanager/server_test.go b/tests/integrations/mcs/resourcemanager/server_test.go
new file mode 100644
index 00000000000..ac758c1650f
--- /dev/null
+++ b/tests/integrations/mcs/resourcemanager/server_test.go
@@ -0,0 +1,124 @@
+// Copyright 2023 TiKV Project Authors.
+//
+// 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 resourcemanager_test
+
+import (
+	"context"
+	"encoding/json"
+	"io"
+	"net/http"
+	"strings"
+	"testing"
+
+	rmpb "github.com/pingcap/kvproto/pkg/resource_manager"
+	"github.com/stretchr/testify/require"
+	"github.com/tikv/pd/client/grpcutil"
+	bs "github.com/tikv/pd/pkg/basicserver"
+	"github.com/tikv/pd/pkg/utils/tempurl"
+	"github.com/tikv/pd/pkg/versioninfo"
+	"github.com/tikv/pd/tests"
+)
+
+func TestResourceManagerServer(t *testing.T) {
+	re := require.New(t)
+
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	cluster, err := tests.NewTestClusterWithKeyspace(ctx, 1)
+	defer cluster.Destroy()
+	re.NoError(err)
+
+	err = cluster.RunInitialServers()
+	re.NoError(err)
+
+	leaderName := cluster.WaitLeader()
+	re.NotEmpty(leaderName)
+	leader := cluster.GetServer(leaderName)
+
+	s, cleanup := tests.StartSingleResourceManagerTestServer(ctx, re, leader.GetAddr(), tempurl.Alloc())
+	addr := s.GetAddr()
+	defer cleanup()
+	tests.WaitForPrimaryServing(re, map[string]bs.Server{addr: s})
+
+	// Test registered GRPC Service
+	cc, err := grpcutil.GetClientConn(ctx, addr, nil)
+	re.NoError(err)
+	defer cc.Close()
+
+	c := rmpb.NewResourceManagerClient(cc)
+	_, err = c.GetResourceGroup(context.Background(), &rmpb.GetResourceGroupRequest{
+		ResourceGroupName: "pingcap",
+	})
+	re.ErrorContains(err, "resource group not found")
+
+	// Test registered REST HTTP Handler
+	url := addr + "/resource-manager/api/v1/config"
+	{
+		resp, err := tests.TestDialClient.Get(url + "/groups")
+		re.NoError(err)
+		defer resp.Body.Close()
+		re.Equal(http.StatusOK, resp.StatusCode)
+		respString, err := io.ReadAll(resp.Body)
+		re.NoError(err)
+		re.JSONEq(`[{"name":"default","mode":1,"r_u_settings":{"r_u":{"settings":{"fill_rate":2147483647,"burst_limit":-1},"state":{"initialized":false}}},"priority":8}]`, string(respString))
+	}
+	{
+		group := &rmpb.ResourceGroup{
+			Name: "pingcap",
+			Mode: 1,
+		}
+		createJSON, err := json.Marshal(group)
+		re.NoError(err)
+		resp, err := tests.TestDialClient.Post(url+"/group", "application/json", strings.NewReader(string(createJSON)))
+		re.NoError(err)
+		defer resp.Body.Close()
+		re.Equal(http.StatusOK, resp.StatusCode)
+	}
+	{
+		resp, err := tests.TestDialClient.Get(url + "/group/pingcap")
+		re.NoError(err)
+		defer resp.Body.Close()
+		re.Equal(http.StatusOK, resp.StatusCode)
+		respString, err := io.ReadAll(resp.Body)
+		re.NoError(err)
+		re.JSONEq("{\"name\":\"pingcap\",\"mode\":1,\"r_u_settings\":{\"r_u\":{\"state\":{\"initialized\":false}}},\"priority\":0}", string(respString))
+	}
+
+	// Test metrics handler
+	{
+		resp, err := tests.TestDialClient.Get(addr + "/metrics")
+		re.NoError(err)
+		defer resp.Body.Close()
+		re.Equal(http.StatusOK, resp.StatusCode)
+		respBytes, err := io.ReadAll(resp.Body)
+		re.NoError(err)
+		re.Contains(string(respBytes), "pd_server_info")
+	}
+
+	// Test status handler
+	{
+		resp, err := tests.TestDialClient.Get(addr + "/status")
+		re.NoError(err)
+		defer resp.Body.Close()
+		re.Equal(http.StatusOK, resp.StatusCode)
+		respBytes, err := io.ReadAll(resp.Body)
+		re.NoError(err)
+		var s versioninfo.Status
+		re.NoError(json.Unmarshal(respBytes, &s))
+		re.Equal(versioninfo.PDBuildTS, s.BuildTS)
+		re.Equal(versioninfo.PDGitHash, s.GitHash)
+		re.Equal(versioninfo.PDReleaseVersion, s.Version)
+	}
+}
diff --git a/tests/integrations/mcs/scheduling/api_test.go b/tests/integrations/mcs/scheduling/api_test.go
index f3e7f235018..938aa39ae82 100644
--- a/tests/integrations/mcs/scheduling/api_test.go
+++ b/tests/integrations/mcs/scheduling/api_test.go
@@ -53,7 +53,7 @@ func (suite *apiTestSuite) TearDownSuite() {
 }
 
 func (suite *apiTestSuite) TestGetCheckerByName() {
-	suite.env.RunTestInAPIMode(suite.checkGetCheckerByName)
+	suite.env.RunTestInKeyspaceMode(suite.checkGetCheckerByName)
 }
 
 func (suite *apiTestSuite) checkGetCheckerByName(cluster *tests.TestCluster) {
@@ -99,7 +99,7 @@ func (suite *apiTestSuite) checkGetCheckerByName(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestAPIForward() {
-	suite.env.RunTestInAPIMode(suite.checkAPIForward)
+	suite.env.RunTestInKeyspaceMode(suite.checkAPIForward)
 }
 
 func (suite *apiTestSuite) checkAPIForward(cluster *tests.TestCluster) {
@@ -375,7 +375,7 @@ func (suite *apiTestSuite) checkAPIForward(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestConfig() {
-	suite.env.RunTestInAPIMode(suite.checkConfig)
+	suite.env.RunTestInKeyspaceMode(suite.checkConfig)
 }
 
 func (suite *apiTestSuite) checkConfig(cluster *tests.TestCluster) {
@@ -398,7 +398,7 @@ func (suite *apiTestSuite) checkConfig(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestConfigForward() {
-	suite.env.RunTestInAPIMode(suite.checkConfigForward)
+	suite.env.RunTestInKeyspaceMode(suite.checkConfigForward)
 }
 
 func (suite *apiTestSuite) checkConfigForward(cluster *tests.TestCluster) {
@@ -449,7 +449,7 @@ func (suite *apiTestSuite) checkConfigForward(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestAdminRegionCache() {
-	suite.env.RunTestInAPIMode(suite.checkAdminRegionCache)
+	suite.env.RunTestInKeyspaceMode(suite.checkAdminRegionCache)
 }
 
 func (suite *apiTestSuite) checkAdminRegionCache(cluster *tests.TestCluster) {
@@ -476,7 +476,7 @@ func (suite *apiTestSuite) checkAdminRegionCache(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestAdminRegionCacheForward() {
-	suite.env.RunTestInAPIMode(suite.checkAdminRegionCacheForward)
+	suite.env.RunTestInKeyspaceMode(suite.checkAdminRegionCacheForward)
 }
 
 func (suite *apiTestSuite) checkAdminRegionCacheForward(cluster *tests.TestCluster) {
@@ -517,7 +517,7 @@ func (suite *apiTestSuite) checkFollowerForward(cluster *tests.TestCluster) {
 	leaderAddr := cluster.GetLeaderServer().GetAddr()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	follower, err := cluster.JoinAPIServer(ctx)
+	follower, err := cluster.JoinServerWithKeyspace(ctx)
 	re.NoError(err)
 	re.NoError(follower.Run())
 	re.NotEmpty(cluster.WaitLeader())
@@ -555,7 +555,7 @@ func (suite *apiTestSuite) checkFollowerForward(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestMetrics() {
-	suite.env.RunTestInAPIMode(suite.checkMetrics)
+	suite.env.RunTestInKeyspaceMode(suite.checkMetrics)
 }
 
 func (suite *apiTestSuite) checkMetrics(cluster *tests.TestCluster) {
@@ -574,7 +574,7 @@ func (suite *apiTestSuite) checkMetrics(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestStatus() {
-	suite.env.RunTestInAPIMode(suite.checkStatus)
+	suite.env.RunTestInKeyspaceMode(suite.checkStatus)
 }
 
 func (suite *apiTestSuite) checkStatus(cluster *tests.TestCluster) {
@@ -597,7 +597,7 @@ func (suite *apiTestSuite) checkStatus(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestStores() {
-	suite.env.RunTestInAPIMode(suite.checkStores)
+	suite.env.RunTestInKeyspaceMode(suite.checkStores)
 }
 
 func (suite *apiTestSuite) checkStores(cluster *tests.TestCluster) {
@@ -679,7 +679,7 @@ func (suite *apiTestSuite) checkStores(cluster *tests.TestCluster) {
 }
 
 func (suite *apiTestSuite) TestRegions() {
-	suite.env.RunTestInAPIMode(suite.checkRegions)
+	suite.env.RunTestInKeyspaceMode(suite.checkRegions)
 }
 
 func (suite *apiTestSuite) checkRegions(cluster *tests.TestCluster) {
diff --git a/tests/integrations/mcs/scheduling/config_test.go b/tests/integrations/mcs/scheduling/config_test.go
index 6a41ad0823e..f995eae267e 100644
--- a/tests/integrations/mcs/scheduling/config_test.go
+++ b/tests/integrations/mcs/scheduling/config_test.go
@@ -60,7 +60,7 @@ func (suite *configTestSuite) SetupSuite() {
 	schedulers.Register()
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
 	re.NoError(err)
diff --git a/tests/integrations/mcs/scheduling/meta_test.go b/tests/integrations/mcs/scheduling/meta_test.go
index 0798e9f129e..6eae176a321 100644
--- a/tests/integrations/mcs/scheduling/meta_test.go
+++ b/tests/integrations/mcs/scheduling/meta_test.go
@@ -51,7 +51,7 @@ func (suite *metaTestSuite) SetupSuite() {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs", `return(true)`))
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
 	re.NoError(err)
diff --git a/tests/integrations/mcs/scheduling/rule_test.go b/tests/integrations/mcs/scheduling/rule_test.go
index e8b394ec075..6939f0afad0 100644
--- a/tests/integrations/mcs/scheduling/rule_test.go
+++ b/tests/integrations/mcs/scheduling/rule_test.go
@@ -48,7 +48,7 @@ func (suite *ruleTestSuite) SetupSuite() {
 
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
 	re.NoError(err)
diff --git a/tests/integrations/mcs/scheduling/server_test.go b/tests/integrations/mcs/scheduling/server_test.go
index 085b87afe86..651234928af 100644
--- a/tests/integrations/mcs/scheduling/server_test.go
+++ b/tests/integrations/mcs/scheduling/server_test.go
@@ -64,7 +64,7 @@ func (suite *serverTestSuite) SetupSuite() {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/mcs/scheduling/server/changeRunCollectWaitTime", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs", `return(true)`))
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
@@ -632,7 +632,7 @@ func (suite *multipleServerTestSuite) SetupSuite() {
 	re := suite.Require()
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs", `return(true)`))
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 2)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 2)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
diff --git a/tests/integrations/mcs/tso/api_test.go b/tests/integrations/mcs/tso/api_test.go
index 7abf1503bec..c3b9839e9e6 100644
--- a/tests/integrations/mcs/tso/api_test.go
+++ b/tests/integrations/mcs/tso/api_test.go
@@ -60,7 +60,7 @@ func (suite *tsoAPITestSuite) SetupTest() {
 
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.pdCluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.pdCluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	err = suite.pdCluster.RunInitialServers()
 	re.NoError(err)
@@ -135,7 +135,7 @@ func TestTSOServerStartFirst(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	apiCluster, err := tests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	apiCluster, err := tests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = []string{"k1", "k2"}
 	})
 	defer apiCluster.Destroy()
@@ -198,7 +198,7 @@ func TestForwardOnlyTSONoScheduling(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	tc, err := tests.NewTestAPICluster(ctx, 1)
+	tc, err := tests.NewTestClusterWithKeyspace(ctx, 1)
 	defer tc.Destroy()
 	re.NoError(err)
 	err = tc.RunInitialServers()
diff --git a/tests/integrations/mcs/tso/keyspace_group_manager_test.go b/tests/integrations/mcs/tso/keyspace_group_manager_test.go
index 51f3fd37295..e8631fec8a7 100644
--- a/tests/integrations/mcs/tso/keyspace_group_manager_test.go
+++ b/tests/integrations/mcs/tso/keyspace_group_manager_test.go
@@ -80,7 +80,7 @@ func (suite *tsoKeyspaceGroupManagerTestSuite) SetupSuite() {
 
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
 	re.NoError(err)
@@ -536,7 +536,7 @@ func TestTwiceSplitKeyspaceGroup(t *testing.T) {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/tso/fastGroupSplitPatroller", `return(true)`))
 
 	// Init api server config but not start.
-	tc, err := tests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := tests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = []string{
 			"keyspace_a", "keyspace_b",
 		}
@@ -733,7 +733,7 @@ func TestGetTSOImmediately(t *testing.T) {
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/tso/fastGroupSplitPatroller", `return(true)`))
 
 	// Init api server config but not start.
-	tc, err := tests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := tests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = []string{
 			"keyspace_a", "keyspace_b",
 		}
diff --git a/tests/integrations/mcs/tso/proxy_test.go b/tests/integrations/mcs/tso/proxy_test.go
index a15cbb1cd03..0865de91c81 100644
--- a/tests/integrations/mcs/tso/proxy_test.go
+++ b/tests/integrations/mcs/tso/proxy_test.go
@@ -60,7 +60,7 @@ func (s *tsoProxyTestSuite) SetupSuite() {
 	var err error
 	s.ctx, s.cancel = context.WithCancel(context.Background())
 	// Create an API cluster with 1 server
-	s.apiCluster, err = tests.NewTestAPICluster(s.ctx, 1)
+	s.apiCluster, err = tests.NewTestClusterWithKeyspace(s.ctx, 1)
 	re.NoError(err)
 	err = s.apiCluster.RunInitialServers()
 	re.NoError(err)
diff --git a/tests/integrations/mcs/tso/server_test.go b/tests/integrations/mcs/tso/server_test.go
index b0660ed6577..728aeae3e37 100644
--- a/tests/integrations/mcs/tso/server_test.go
+++ b/tests/integrations/mcs/tso/server_test.go
@@ -73,7 +73,7 @@ func (suite *tsoServerTestSuite) SetupSuite() {
 	re := suite.Require()
 
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
@@ -154,19 +154,19 @@ func (suite *tsoServerTestSuite) TestParticipantStartWithAdvertiseListenAddr() {
 
 func TestTSOPath(t *testing.T) {
 	re := require.New(t)
-	checkTSOPath(re, true /*isAPIServiceMode*/)
-	checkTSOPath(re, false /*isAPIServiceMode*/)
+	checkTSOPath(re, true /*isKeyspaceEnabled*/)
+	checkTSOPath(re, false /*isKeyspaceEnabled*/)
 }
 
-func checkTSOPath(re *require.Assertions, isAPIServiceMode bool) {
+func checkTSOPath(re *require.Assertions, isKeyspaceEnabled bool) {
 	var (
 		cluster *tests.TestCluster
 		err     error
 	)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	if isAPIServiceMode {
-		cluster, err = tests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	if isKeyspaceEnabled {
+		cluster, err = tests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 			conf.MicroService.EnableTSODynamicSwitching = false
 		})
 	} else {
@@ -182,7 +182,7 @@ func checkTSOPath(re *require.Assertions, isAPIServiceMode bool) {
 	re.NoError(pdLeader.BootstrapCluster())
 	backendEndpoints := pdLeader.GetAddr()
 	client := pdLeader.GetEtcdClient()
-	if isAPIServiceMode {
+	if isKeyspaceEnabled {
 		re.Equal(0, getEtcdTimestampKeyNum(re, client))
 	} else {
 		re.Equal(1, getEtcdTimestampKeyNum(re, client))
@@ -225,13 +225,13 @@ type APIServerForward struct {
 	pdClient         pd.Client
 }
 
-func NewAPIServerForward(re *require.Assertions) APIServerForward {
+func NewServerForward(re *require.Assertions) APIServerForward {
 	suite := APIServerForward{
 		re: re,
 	}
 	var err error
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 3)
+	suite.cluster, err = tests.NewTestCluster(suite.ctx, 3)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
@@ -271,7 +271,7 @@ func (suite *APIServerForward) ShutDown() {
 
 func TestForwardTSORelated(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 	leaderServer := suite.cluster.GetLeaderServer().GetServer()
 	cfg := leaderServer.GetMicroServiceConfig().Clone()
@@ -288,7 +288,7 @@ func TestForwardTSORelated(t *testing.T) {
 
 func TestForwardTSOWhenPrimaryChanged(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 
 	tc, err := tests.NewTestTSOCluster(suite.ctx, 2, suite.backendEndpoints)
@@ -328,7 +328,7 @@ func TestForwardTSOWhenPrimaryChanged(t *testing.T) {
 
 func TestResignTSOPrimaryForward(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 	// TODO: test random kill primary with 3 nodes
 	tc, err := tests.NewTestTSOCluster(suite.ctx, 2, suite.backendEndpoints)
@@ -354,7 +354,7 @@ func TestResignTSOPrimaryForward(t *testing.T) {
 
 func TestResignAPIPrimaryForward(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 
 	tc, err := tests.NewTestTSOCluster(suite.ctx, 2, suite.backendEndpoints)
@@ -378,7 +378,7 @@ func TestResignAPIPrimaryForward(t *testing.T) {
 
 func TestForwardTSOUnexpectedToFollower1(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 	suite.checkForwardTSOUnexpectedToFollower(func() {
 		// unary call will retry internally
@@ -391,7 +391,7 @@ func TestForwardTSOUnexpectedToFollower1(t *testing.T) {
 
 func TestForwardTSOUnexpectedToFollower2(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 	suite.checkForwardTSOUnexpectedToFollower(func() {
 		// unary call will retry internally
@@ -405,7 +405,7 @@ func TestForwardTSOUnexpectedToFollower2(t *testing.T) {
 
 func TestForwardTSOUnexpectedToFollower3(t *testing.T) {
 	re := require.New(t)
-	suite := NewAPIServerForward(re)
+	suite := NewServerForward(re)
 	defer suite.ShutDown()
 	suite.checkForwardTSOUnexpectedToFollower(func() {
 		_, _, err := suite.pdClient.GetTS(suite.ctx)
@@ -510,7 +510,7 @@ func (suite *CommonTestSuite) SetupSuite() {
 	var err error
 	re := suite.Require()
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	suite.cluster, err = tests.NewTestAPICluster(suite.ctx, 1)
+	suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 
 	err = suite.cluster.RunInitialServers()
@@ -574,7 +574,7 @@ func (suite *CommonTestSuite) TestBootstrapDefaultKeyspaceGroup() {
 	}
 	check()
 
-	s, err := suite.cluster.JoinAPIServer(suite.ctx)
+	s, err := suite.cluster.JoinServerWithKeyspace(suite.ctx)
 	re.NoError(err)
 	re.NoError(s.Run())
 
@@ -596,7 +596,7 @@ func TestTSOServiceSwitch(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	tc, err := tests.NewTestAPICluster(ctx, 1,
+	tc, err := tests.NewTestClusterWithKeyspace(ctx, 1,
 		func(conf *config.Config, _ string) {
 			conf.MicroService.EnableTSODynamicSwitching = true
 		},
diff --git a/tests/integrations/tso/client_test.go b/tests/integrations/tso/client_test.go
index fa2cc80379d..7856b6cae72 100644
--- a/tests/integrations/tso/client_test.go
+++ b/tests/integrations/tso/client_test.go
@@ -96,7 +96,7 @@ func (suite *tsoClientTestSuite) SetupSuite() {
 	if suite.legacy {
 		suite.cluster, err = tests.NewTestCluster(suite.ctx, serverCount)
 	} else {
-		suite.cluster, err = tests.NewTestAPICluster(suite.ctx, serverCount, func(conf *config.Config, _ string) {
+		suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, serverCount, func(conf *config.Config, _ string) {
 			conf.MicroService.EnableTSODynamicSwitching = false
 		})
 	}
@@ -508,7 +508,7 @@ func TestMixedTSODeployment(t *testing.T) {
 	re.NotNil(leaderServer)
 	backendEndpoints := leaderServer.GetAddr()
 
-	apiSvr, err := cluster.JoinAPIServer(ctx)
+	apiSvr, err := cluster.JoinServerWithKeyspace(ctx)
 	re.NoError(err)
 	err = apiSvr.Run()
 	re.NoError(err)
@@ -542,7 +542,7 @@ func TestUpgradingAPIandTSOClusters(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 
 	// Create an API cluster which has 3 servers
-	apiCluster, err := tests.NewTestAPICluster(ctx, 3)
+	apiCluster, err := tests.NewTestClusterWithKeyspace(ctx, 3)
 	re.NoError(err)
 	err = apiCluster.RunInitialServers()
 	re.NoError(err)
diff --git a/tests/integrations/tso/consistency_test.go b/tests/integrations/tso/consistency_test.go
index 2ef2ebe3077..809d3139939 100644
--- a/tests/integrations/tso/consistency_test.go
+++ b/tests/integrations/tso/consistency_test.go
@@ -74,7 +74,7 @@ func (suite *tsoConsistencyTestSuite) SetupSuite() {
 	if suite.legacy {
 		suite.cluster, err = tests.NewTestCluster(suite.ctx, serverCount)
 	} else {
-		suite.cluster, err = tests.NewTestAPICluster(suite.ctx, serverCount)
+		suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, serverCount)
 	}
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
diff --git a/tests/integrations/tso/server_test.go b/tests/integrations/tso/server_test.go
index c0d71050964..9d0be058e0c 100644
--- a/tests/integrations/tso/server_test.go
+++ b/tests/integrations/tso/server_test.go
@@ -72,7 +72,7 @@ func (suite *tsoServerTestSuite) SetupSuite() {
 	if suite.legacy {
 		suite.cluster, err = tests.NewTestCluster(suite.ctx, serverCount)
 	} else {
-		suite.cluster, err = tests.NewTestAPICluster(suite.ctx, serverCount)
+		suite.cluster, err = tests.NewTestClusterWithKeyspace(suite.ctx, serverCount)
 	}
 	re.NoError(err)
 	err = suite.cluster.RunInitialServers()
diff --git a/tests/server/api/scheduler_test.go b/tests/server/api/scheduler_test.go
index 281f7c1dc7e..26a28f9f196 100644
--- a/tests/server/api/scheduler_test.go
+++ b/tests/server/api/scheduler_test.go
@@ -53,7 +53,7 @@ func TestPDSchedulingTestSuite(t *testing.T) {
 
 func TestAPISchedulingTestSuite(t *testing.T) {
 	suite.Run(t, &scheduleTestSuite{
-		runMode: tests.APIMode,
+		runMode: tests.KeyspaceMode,
 	})
 }
 
diff --git a/tests/server/apiv2/handlers/tso_keyspace_group_test.go b/tests/server/apiv2/handlers/tso_keyspace_group_test.go
index 91a07ccd6b1..5304e8de5d1 100644
--- a/tests/server/apiv2/handlers/tso_keyspace_group_test.go
+++ b/tests/server/apiv2/handlers/tso_keyspace_group_test.go
@@ -41,7 +41,7 @@ func TestKeyspaceGroupTestSuite(t *testing.T) {
 func (suite *keyspaceGroupTestSuite) SetupTest() {
 	re := suite.Require()
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
-	cluster, err := tests.NewTestAPICluster(suite.ctx, 1)
+	cluster, err := tests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	suite.cluster = cluster
 	re.NoError(err)
 	re.NoError(cluster.RunInitialServers())
diff --git a/tests/testutil.go b/tests/testutil.go
index b56fd245bd3..c71edab8b2c 100644
--- a/tests/testutil.go
+++ b/tests/testutil.go
@@ -277,8 +277,8 @@ const (
 	Both SchedulerMode = iota
 	// PDMode represents PD mode.
 	PDMode
-	// APIMode represents API mode.
-	APIMode
+	// KeyspaceMode represents keyspace mode.
+	KeyspaceMode
 )
 
 // SchedulingTestEnvironment is used for test purpose.
@@ -301,16 +301,16 @@ func NewSchedulingTestEnvironment(t *testing.T, opts ...ConfigOption) *Schedulin
 }
 
 // RunTestBasedOnMode runs test based on mode.
-// If mode not set, it will run test in both PD mode and API mode.
+// If mode not set, it will run test in both PD mode and keyspace mode.
 func (s *SchedulingTestEnvironment) RunTestBasedOnMode(test func(*TestCluster)) {
 	switch s.RunMode {
 	case PDMode:
 		s.RunTestInPDMode(test)
-	case APIMode:
-		s.RunTestInAPIMode(test)
+	case KeyspaceMode:
+		s.RunTestInKeyspaceMode(test)
 	default:
 		s.RunTestInPDMode(test)
-		s.RunTestInAPIMode(test)
+		s.RunTestInKeyspaceMode(test)
 	}
 }
 
@@ -337,8 +337,8 @@ func getTestName() string {
 	return ""
 }
 
-// RunTestInAPIMode is to run test in api mode.
-func (s *SchedulingTestEnvironment) RunTestInAPIMode(test func(*TestCluster)) {
+// RunTestInKeyspace is to run test with keyspace.
+func (s *SchedulingTestEnvironment) RunTestInKeyspaceMode(test func(*TestCluster)) {
 	re := require.New(s.t)
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/mcs/scheduling/server/fastUpdateMember", `return(true)`))
@@ -346,11 +346,11 @@ func (s *SchedulingTestEnvironment) RunTestInAPIMode(test func(*TestCluster)) {
 		re.NoError(failpoint.Disable("github.com/tikv/pd/pkg/mcs/scheduling/server/fastUpdateMember"))
 		re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/highFrequencyClusterJobs"))
 	}()
-	s.t.Logf("start test %s in api mode", getTestName())
-	if _, ok := s.clusters[APIMode]; !ok {
-		s.startCluster(APIMode)
+	s.t.Logf("start test %s with keyspace", getTestName())
+	if _, ok := s.clusters[KeyspaceMode]; !ok {
+		s.startCluster(KeyspaceMode)
 	}
-	test(s.clusters[APIMode])
+	test(s.clusters[KeyspaceMode])
 }
 
 // Cleanup is to cleanup the environment.
@@ -377,8 +377,8 @@ func (s *SchedulingTestEnvironment) startCluster(m SchedulerMode) {
 		leaderServer := cluster.GetServer(cluster.GetLeader())
 		re.NoError(leaderServer.BootstrapCluster())
 		s.clusters[PDMode] = cluster
-	case APIMode:
-		cluster, err := NewTestAPICluster(ctx, 1, s.opts...)
+	case KeyspaceMode:
+		cluster, err := NewTestClusterWithKeyspace(ctx, 1, s.opts...)
 		re.NoError(err)
 		err = cluster.RunInitialServers()
 		re.NoError(err)
@@ -396,7 +396,7 @@ func (s *SchedulingTestEnvironment) startCluster(m SchedulerMode) {
 		testutil.Eventually(re, func() bool {
 			return cluster.GetLeaderServer().GetServer().IsServiceIndependent(constant.SchedulingServiceName)
 		})
-		s.clusters[APIMode] = cluster
+		s.clusters[KeyspaceMode] = cluster
 	}
 }
 
diff --git a/tools/pd-ctl/tests/keyspace/keyspace_group_test.go b/tools/pd-ctl/tests/keyspace/keyspace_group_test.go
index 9c16b0751f6..13dde9b53fd 100644
--- a/tools/pd-ctl/tests/keyspace/keyspace_group_test.go
+++ b/tools/pd-ctl/tests/keyspace/keyspace_group_test.go
@@ -39,7 +39,7 @@ func TestKeyspaceGroup(t *testing.T) {
 	re := require.New(t)
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	tc, err := pdTests.NewTestAPICluster(ctx, 1)
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 1)
 	re.NoError(err)
 	defer tc.Destroy()
 	err = tc.RunInitialServers()
@@ -100,7 +100,7 @@ func TestSplitKeyspaceGroup(t *testing.T) {
 	for i := range 129 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 3, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 3, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -155,7 +155,7 @@ func TestExternalAllocNodeWhenStart(t *testing.T) {
 	for i := range 10 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -195,7 +195,7 @@ func TestSetNodeAndPriorityKeyspaceGroup(t *testing.T) {
 	for i := range 10 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 3, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 3, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -299,7 +299,7 @@ func TestMergeKeyspaceGroup(t *testing.T) {
 	for i := range 129 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -418,7 +418,7 @@ func TestKeyspaceGroupState(t *testing.T) {
 	for i := range 10 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -509,7 +509,7 @@ func TestShowKeyspaceGroupPrimary(t *testing.T) {
 	for i := range 10 {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 1, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 1, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
diff --git a/tools/pd-ctl/tests/keyspace/keyspace_test.go b/tools/pd-ctl/tests/keyspace/keyspace_test.go
index 4aa3be1d21c..48220a6146a 100644
--- a/tools/pd-ctl/tests/keyspace/keyspace_test.go
+++ b/tools/pd-ctl/tests/keyspace/keyspace_test.go
@@ -47,7 +47,7 @@ func TestKeyspace(t *testing.T) {
 	for i := 1; i < 10; i++ {
 		keyspaces = append(keyspaces, fmt.Sprintf("keyspace_%d", i))
 	}
-	tc, err := pdTests.NewTestAPICluster(ctx, 3, func(conf *config.Config, _ string) {
+	tc, err := pdTests.NewTestClusterWithKeyspace(ctx, 3, func(conf *config.Config, _ string) {
 		conf.Keyspace.PreAlloc = keyspaces
 	})
 	re.NoError(err)
@@ -153,7 +153,7 @@ func (suite *keyspaceTestSuite) SetupTest() {
 	suite.ctx, suite.cancel = context.WithCancel(context.Background())
 	re.NoError(failpoint.Enable("github.com/tikv/pd/server/delayStartServerLoop", `return(true)`))
 	re.NoError(failpoint.Enable("github.com/tikv/pd/pkg/keyspace/skipSplitRegion", "return(true)"))
-	tc, err := pdTests.NewTestAPICluster(suite.ctx, 1)
+	tc, err := pdTests.NewTestClusterWithKeyspace(suite.ctx, 1)
 	re.NoError(err)
 	re.NoError(tc.RunInitialServers())
 	tc.WaitLeader()