diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index e4fe3ae4976..0e54782c921 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -1428,11 +1428,13 @@ public class TestMasterObserver {
       String destName = null;
       String serverNameForFirstRegion = firstGoodPair.getValue().toString();
       LOG.info("serverNameForFirstRegion=" + serverNameForFirstRegion);
+      ServerName masterServerName = master.getServerName();
       boolean found = false;
       // Find server that is NOT carrying the first region
       for (ServerName info : servers) {
         LOG.info("ServerName=" + info);
-        if (!serverNameForFirstRegion.equals(info.getServerName())) {
+        if (!serverNameForFirstRegion.equals(info.getServerName())
+            && !masterServerName.equals(info)) {
           destName = info.toString();
           found = true;
           break;