diff --git a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelectorEdges.java b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelectorEdges.java
index baecd9adf..6e8fcbbba 100644
--- a/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelectorEdges.java
+++ b/curator-recipes/src/test/java/org/apache/curator/framework/recipes/leader/TestLeaderSelectorEdges.java
@@ -42,9 +42,9 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Test cases designed after CURATOR-45
+ * Test cases designed after CURATOR-45.
  */
-@Tag("zk38OrLater")
+@Tag("master")
 public class TestLeaderSelectorEdges extends BaseClassForTests {
     private final Logger log = LoggerFactory.getLogger(getClass());
 
@@ -61,8 +61,6 @@ public static void resetCNXFactory() {
     /**
      * Create a LeaderSelector but close the connection right after the "lock" znode
      * has been created.
-     *
-     * @throws Exception
      */
     @Test
     public void flappingTest() throws Exception {
@@ -83,7 +81,7 @@ public void flappingTest() throws Exception {
             // At this point the ChaosMonkeyZookeeperServer must close the connection
             // right after the lock znode is created.
             assertTrue(listener.reconnected.await(10, TimeUnit.SECONDS), "Connection has not been lost");
-            // Check that leader ship has failed
+            // Check that leadership has failed
             assertEquals(listener.takeLeadership.getCount(), 1);
             // Wait FailedDelete
             Thread.sleep(ChaosMonkeyCnxnFactory.LOCKOUT_DURATION_MS * 2);
diff --git a/curator-test-zk35/pom.xml b/curator-test-zk35/pom.xml
index f0f05f6bb..cfb459901 100644
--- a/curator-test-zk35/pom.xml
+++ b/curator-test-zk35/pom.xml
@@ -211,7 +211,7 @@
                         <dependency>org.apache.curator:curator-recipes</dependency>
                     </dependenciesToScan>
                     <groups>zk35TestCompatibility</groups>
-                    <excludedGroups>zk36,zk38OrLater</excludedGroups>
+                    <excludedGroups>zk36</excludedGroups>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/curator-test-zk36/pom.xml b/curator-test-zk36/pom.xml
index 855617d70..5afd4733c 100644
--- a/curator-test-zk36/pom.xml
+++ b/curator-test-zk36/pom.xml
@@ -225,7 +225,6 @@
                         <dependency>org.apache.curator:curator-client</dependency>
                     </dependenciesToScan>
                     <groups>zk36,zk35TestCompatibility</groups>
-                    <excludedGroups>zk38OrLater</excludedGroups>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/curator-test-zk37/pom.xml b/curator-test-zk37/pom.xml
index f019bf2b8..ad8548a2e 100644
--- a/curator-test-zk37/pom.xml
+++ b/curator-test-zk37/pom.xml
@@ -224,7 +224,7 @@
                         <dependency>org.apache.curator:curator-recipes</dependency>
                         <dependency>org.apache.curator:curator-client</dependency>
                     </dependenciesToScan>
-                    <excludedGroups>zk38OrLater</excludedGroups>
+                    <excludedGroups>master</excludedGroups>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/curator-test-zk38/pom.xml b/curator-test-zk38/pom.xml
index 21f8b20cb..678206e91 100644
--- a/curator-test-zk38/pom.xml
+++ b/curator-test-zk38/pom.xml
@@ -229,6 +229,7 @@
                         <dependency>org.apache.curator:curator-recipes</dependency>
                         <dependency>org.apache.curator:curator-client</dependency>
                     </dependenciesToScan>
+                    <excludedGroups>master</excludedGroups>
                 </configuration>
             </plugin>
         </plugins>