diff --git a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
index 9fc545d5b22..36e95b7b751 100644
--- a/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
+++ b/test-mock-server/src/main/java/org/apache/seata/mockserver/MockServer.java
@@ -44,7 +44,7 @@ public class MockServer {
 
     private static volatile boolean inited = false;
 
-    public static final int DEFAULT_PORT = 8099;
+    public static final int DEFAULT_PORT = 8091;
 
     /**
      * The entry point of application.
diff --git a/test-mock-server/src/main/java/org/apache/seata/mockserver/call/CallRm.java b/test-mock-server/src/main/java/org/apache/seata/mockserver/call/CallRm.java
index 181ff20d568..c58b201ba09 100644
--- a/test-mock-server/src/main/java/org/apache/seata/mockserver/call/CallRm.java
+++ b/test-mock-server/src/main/java/org/apache/seata/mockserver/call/CallRm.java
@@ -45,7 +45,6 @@ public class CallRm {
     public static BranchStatus branchCommit(RemotingServer remotingServer, BranchSession branchSession) {
         BranchCommitRequest request = new BranchCommitRequest();
         setReq(request, branchSession);
-
         try {
             BranchCommitResponse response = (BranchCommitResponse) remotingServer.sendSyncRequest(
                     branchSession.getResourceId(), branchSession.getClientId(), request, false);
@@ -99,7 +98,6 @@ private static void setReq(AbstractBranchEndRequest request, BranchSession branc
         request.setBranchId(branchSession.getBranchId());
         request.setResourceId(branchSession.getResourceId());
         request.setApplicationData("{\"actionContext\":{\"mock\":\"mock\"}}");
-        request.setBranchType(BranchType.TCC);
-        // todo AT SAGA
+        request.setBranchType(branchSession.getBranchType());
     }
 }
diff --git a/test-mock-server/src/main/resources/application.yml b/test-mock-server/src/main/resources/application.yml
index c5565e224ef..473af449775 100644
--- a/test-mock-server/src/main/resources/application.yml
+++ b/test-mock-server/src/main/resources/application.yml
@@ -16,7 +16,7 @@
 #
 server:
   port: 7091
-  servicePort: 8099
+  servicePort: 8091
 
 spring:
   application:
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/ChannelManagerTestHelper.java b/test/src/test/java/org/apache/seata/core/rpc/netty/ChannelManagerTestHelper.java
index 59786b8d88f..0ed3179eccc 100644
--- a/test/src/test/java/org/apache/seata/core/rpc/netty/ChannelManagerTestHelper.java
+++ b/test/src/test/java/org/apache/seata/core/rpc/netty/ChannelManagerTestHelper.java
@@ -32,7 +32,7 @@ public static ConcurrentMap<String, Channel> getChannelConcurrentMap(AbstractNet
 
     public static Channel getChannel(TmNettyRemotingClient client) {
         return getChannelManager(client)
-                .acquireChannel(ProtocolTestConstants.SERVER_ADDRESS);
+                .acquireChannel(ProtocolTestConstants.MOCK_SERVER_ADDRESS);
     }
     private static NettyClientChannelManager getChannelManager(AbstractNettyRemotingClient remotingClient) {
         return remotingClient.getClientChannelManager();
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java
index 74713489f0d..887c7274f36 100644
--- a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java
+++ b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/MockServerTest.java
@@ -39,8 +39,8 @@ public class MockServerTest {
 
     @BeforeAll
     public static void before() {
-        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.SERVER_PORT));
-        MockServer.start(ProtocolTestConstants.SERVER_PORT);
+        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.MOCK_SERVER_PORT));
+        MockServer.start(ProtocolTestConstants.MOCK_SERVER_PORT);
     }
 
     @AfterAll
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java
index 8576a976389..d848fd890d3 100644
--- a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java
+++ b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/ProtocolTestConstants.java
@@ -16,14 +16,12 @@
  */
 package org.apache.seata.core.rpc.netty.mockserver;
 
-import org.apache.seata.mockserver.MockServer;
-
 /**
  * Mock Constants
  **/
 public class ProtocolTestConstants {
     public static final String APPLICATION_ID = "my_app_test";
     public static final String SERVICE_GROUP = "mock_tx_group";
-    public static final int SERVER_PORT = MockServer.DEFAULT_PORT;
-    public static final String SERVER_ADDRESS = "0.0.0.0:" + SERVER_PORT;
+    public static final int MOCK_SERVER_PORT = 8099;
+    public static final String MOCK_SERVER_ADDRESS = "0.0.0.0:" + MOCK_SERVER_PORT;
 }
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java
index 8f84c5c1374..d3fc8b4b380 100644
--- a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java
+++ b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/RmClientTest.java
@@ -49,8 +49,8 @@ public class RmClientTest {
 
     @BeforeAll
     public static void before() {
-        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.SERVER_PORT));
-        MockServer.start(ProtocolTestConstants.SERVER_PORT);
+        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.MOCK_SERVER_PORT));
+        MockServer.start(ProtocolTestConstants.MOCK_SERVER_PORT);
     }
 
     @AfterAll
diff --git a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java
index 09cf7e8c3ad..df0f02f3b73 100644
--- a/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java
+++ b/test/src/test/java/org/apache/seata/core/rpc/netty/mockserver/TmClientTest.java
@@ -44,8 +44,8 @@ public class TmClientTest {
 
     @BeforeAll
     public static void before() {
-        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.SERVER_PORT));
-        MockServer.start(ProtocolTestConstants.SERVER_PORT);
+        ConfigurationTestHelper.putConfig(ConfigurationKeys.SERVER_SERVICE_PORT_CAMEL, String.valueOf(ProtocolTestConstants.MOCK_SERVER_PORT));
+        MockServer.start(ProtocolTestConstants.MOCK_SERVER_PORT);
     }
 
     @AfterAll