diff --git a/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java b/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
index 086aeb695c411..e6ddfd94871ce 100644
--- a/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
+++ b/server/src/internalClusterTest/java/org/opensearch/discovery/SnapshotDisruptionIT.java
@@ -248,7 +248,7 @@ public void testMasterFailOverDuringShardSnapshots() throws Exception {
 
         blockDataNode(repoName, dataNode);
 
-        logger.info("--> create snapshot via master node client");
+        logger.info("--> create snapshot via cluster-manager node client");
         final ActionFuture<CreateSnapshotResponse> snapshotResponse = internalCluster().masterClient()
             .admin()
             .cluster()
@@ -272,7 +272,7 @@ public void testMasterFailOverDuringShardSnapshots() throws Exception {
             SnapshotException.class,
             () -> snapshotResponse.actionGet(TimeValue.timeValueSeconds(30L))
         );
-        assertThat(sne.getMessage(), endsWith("no longer master"));
+        assertThat(sne.getMessage(), endsWith("no longer cluster-manager"));
     }
 
     private void assertSnapshotExists(String repository, String snapshot) {
diff --git a/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java b/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java
index 69dc332e2bd29..b06799312d99a 100644
--- a/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java
+++ b/server/src/test/java/org/opensearch/cluster/coordination/LeaderCheckerTests.java
@@ -509,7 +509,7 @@ public void testLeaderBehaviour() {
             CoordinationStateRejectedException cause = (CoordinationStateRejectedException) handler.transportException.getRootCause();
             assertThat(
                 cause.getMessage(),
-                equalTo("rejecting leader check from [" + otherNode + "] sent to a node that is no longer the master")
+                equalTo("rejecting leader check from [" + otherNode + "] sent to a node that is no longer the cluster-manager")
             );
         }
     }