diff --git a/CHANGES.txt b/CHANGES.txt
index e8f457c931f..f8abeb8491e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -91,6 +91,8 @@ BUGFIXES:
 
   ZOOKEEPER-2062 RemoveWatchesTest takes forever to run (Chris Nauroth via rakeshr)
 
+  ZOOKEEPER-2182 Several test suites are not running during pre-commit, because their names do not end with "Test". (Chris Nauroth via hdeng)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  
 
diff --git a/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java b/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
similarity index 99%
rename from src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
rename to src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
index d6fcdc9cf7f..e7147b35998 100644
--- a/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCases.java
+++ b/src/java/test/org/apache/zookeeper/server/quorum/ReconfigFailureCasesTest.java
@@ -37,7 +37,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ReconfigFailureCases extends QuorumPeerTestBase {
+public class ReconfigFailureCasesTest extends QuorumPeerTestBase {
 
     private QuorumUtil qu;
 
diff --git a/src/java/test/org/apache/zookeeper/test/ClientRetry.java b/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
similarity index 97%
rename from src/java/test/org/apache/zookeeper/test/ClientRetry.java
rename to src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
index d0b6b43f4df..e53d911ef59 100644
--- a/src/java/test/org/apache/zookeeper/test/ClientRetry.java
+++ b/src/java/test/org/apache/zookeeper/test/ClientRetryTest.java
@@ -25,7 +25,7 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class ClientRetry extends ClientBase {
+public class ClientRetryTest extends ClientBase {
 
     @Override
     public void setUp() throws Exception {
@@ -58,6 +58,7 @@ public void testClientRetry() throws IOException, InterruptedException, TimeoutE
                 Assert.assertSame(s1,States.CONNECTED);
                 Assert.assertSame(s2,States.CONNECTING);
                 cdw1.reset();
+                zk.close();
                 cdw1.waitForDisconnected(CONNECTION_TIMEOUT);
                 cdw2.waitForConnected(CONNECTION_TIMEOUT);
                 Assert.assertSame(zk2.getState(),States.CONNECTED);
diff --git a/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java b/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
similarity index 98%
rename from src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
rename to src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
index eed02c5845b..59e16fe7941 100644
--- a/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoReset.java
+++ b/src/java/test/org/apache/zookeeper/test/WatchEventWhenAutoResetTest.java
@@ -36,9 +36,9 @@
 
 import junit.framework.TestCase;
 
-public class WatchEventWhenAutoReset extends TestCase {
+public class WatchEventWhenAutoResetTest extends TestCase {
     protected static final Logger LOG = LoggerFactory
-            .getLogger(WatchEventWhenAutoReset.class);
+            .getLogger(WatchEventWhenAutoResetTest.class);
 
     // waiting time for expected condition
     private static final int TIMEOUT = 30000;