diff --git a/src/test/java/redis/clients/jedis/SentinelMasterListenerTest.java b/src/test/java/redis/clients/jedis/SentinelMasterListenerTest.java
new file mode 100644
index 0000000000..0910d9e451
--- /dev/null
+++ b/src/test/java/redis/clients/jedis/SentinelMasterListenerTest.java
@@ -0,0 +1,60 @@
+package redis.clients.jedis;
+
+import org.junit.Before;
+import org.junit.Test;
+import redis.clients.jedis.util.JedisSentinelTestUtil;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * In order to simulate the scenario of active/standby switching. this test case will effect all the
+ * sentinel test case, you can run this test case separately ZSentinelMasterListenerTest start with
+ * "Z" to ensure this test case should be run as last one
+ */
+public class SentinelMasterListenerTest {
+
+  private static final String FAILOVER_MASTER_NAME = "mymasterfailover";
+
+  public final Set<String> sentinels = new HashSet<>();
+  protected static HostAndPort sentinelForFailover = HostAndPorts.getSentinelServers().get(2);
+
+  @Before
+  public void setUp() throws Exception {
+    sentinels.clear();
+    sentinels.add(sentinelForFailover.toString());
+  }
+
+  @Test
+  public void testSentinelMasterListener() throws InterruptedException {
+
+    Jedis j = new Jedis(sentinelForFailover);
+    Jedis j2 = new Jedis(sentinelForFailover);
+
+    SentinelPoolConfig config = new SentinelPoolConfig();
+    config.setEnableActiveDetectListener(true);
+    config.setEnableDefaultSubscribeListener(true);
+    config.setActiveDetectIntervalTimeMillis(5 * 1000);
+    config.setSubscribeRetryWaitTimeMillis(5 * 1000);
+
+    JedisSentinelPool pool = new JedisSentinelPool(FAILOVER_MASTER_NAME, sentinels, config, 1000,
+        "foobared", 2);
+
+    try {
+      HostAndPort masterGetFromPoolBefore = pool.getResource().connection.getHostAndPort();
+
+      JedisSentinelTestUtil.waitForNewPromotedMaster(FAILOVER_MASTER_NAME, j, j2);
+
+      HostAndPort masterGetFromPoolCurrent = pool.getResource().connection.getHostAndPort();
+
+      assertNotEquals(masterGetFromPoolBefore, masterGetFromPoolCurrent);
+    } finally {
+      j.close();
+      j2.close();
+      pool.destroy();
+    }
+  }
+
+}
diff --git a/src/test/java/redis/clients/jedis/ZSentinelMasterListenerTest.java b/src/test/java/redis/clients/jedis/ZSentinelMasterListenerTest.java
deleted file mode 100644
index 05f5c67011..0000000000
--- a/src/test/java/redis/clients/jedis/ZSentinelMasterListenerTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package redis.clients.jedis;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import redis.clients.jedis.providers.SentineledConnectionProvider;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-/**
- * In order to simulate the scenario of active/standby switching. this test case will effect all the
- * sentinel test case, you can run this test case separately ZSentinelMasterListenerTest start with
- * "Z" to ensure this test case should be run as last one
- */
-public class ZSentinelMasterListenerTest {
-  private static final String MASTER_NAME = "mymaster";
-
-  public static final HostAndPort sentinel1 = HostAndPorts.getSentinelServers().get(0);
-  public static final HostAndPort sentinel2 = HostAndPorts.getSentinelServers().get(1);
-
-  public final Set<String> sentinels = new HashSet<>();
-
-  public final Set<HostAndPort> hostAndPortsSentinels = new HashSet<>();
-
-  @Before
-  public void setUp() throws Exception {
-    sentinels.clear();
-    hostAndPortsSentinels.clear();
-
-    sentinels.add(sentinel1.toString());
-    sentinels.add(sentinel2.toString());
-
-    hostAndPortsSentinels.add(sentinel1);
-    hostAndPortsSentinels.add(sentinel2);
-  }
-
-  @Test
-  public void testSentinelMasterListener() {
-    // case : subscribe on ,active on
-    SentinelPoolConfig config = new SentinelPoolConfig();
-    config.setEnableActiveDetectListener(true);
-    config.setEnableDefaultSubscribeListener(true);
-    config.setActiveDetectIntervalTimeMillis(5 * 1000);
-    config.setSubscribeRetryWaitTimeMillis(5 * 1000);
-
-    // get resource by pool
-    JedisSentinelPool pool = new JedisSentinelPool(MASTER_NAME, sentinels, config, 1000, "foobared",
-        2);
-    HostAndPort masterGetFromPool = pool.getResource().connection.getHostAndPort();
-
-    // get resource by connection provider
-    SentineledConnectionProvider sentineledConnectionProvider = new SentineledConnectionProvider(
-        MASTER_NAME, DefaultJedisClientConfig.builder().timeoutMillis(1000).password("foobared")
-            .database(2).build(),
-        config, hostAndPortsSentinels, DefaultJedisClientConfig.builder().build());
-    JedisSentineled jedisSentineled = new JedisSentineled(sentineledConnectionProvider);
-    HostAndPort masterGetFromProvider = jedisSentineled.provider.getConnection().getHostAndPort();
-
-    assertEquals(masterGetFromPool, masterGetFromProvider);
-
-    // failover
-    Jedis sentinel = new Jedis(sentinel1);
-    sentinel.sendCommand(Protocol.Command.SENTINEL, "failover", MASTER_NAME);
-
-    for (int i = 0; i < 10; i++) {
-      HostAndPort masterGetFromPool2 = pool.getResource().connection.getHostAndPort();
-      if (!masterGetFromPool2.equals(masterGetFromPool)) {
-        break;
-      }
-      try {
-        Thread.sleep(5000);
-      } catch (InterruptedException e) {
-        e.printStackTrace();
-      }
-    }
-
-    HostAndPort masterGetFromPool2 = pool.getResource().connection.getHostAndPort();
-    HostAndPort masterGetFromProvider2 = jedisSentineled.provider.getConnection().getHostAndPort();
-    assertEquals(masterGetFromPool2, masterGetFromPool2);
-    assertNotEquals(masterGetFromPool, masterGetFromPool2);
-    assertNotEquals(masterGetFromProvider, masterGetFromProvider2);
-
-    pool.destroy();
-  }
-
-  @After
-  public void restoreMaster() throws Exception {
-    Jedis sentinel = new Jedis(sentinel1);
-    sentinel.sendCommand(Protocol.Command.SENTINEL, "failover", MASTER_NAME);
-  }
-
-}