diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
index af90e32a29d..112a195c3b6 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/ConnectionCache.java
@@ -220,6 +220,7 @@ public class ConnectionCache {
       if (EnvironmentEdgeManager.currentTime() > timeoutTime) {
         connections.remove(userName);
         closed = true;
+        return true;
       }
       return false;
     }
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
new file mode 100644
index 00000000000..99b82f2bd44
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestConnectionCache.java
@@ -0,0 +1,54 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.util;
+
+import junit.framework.TestCase;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.security.UserProvider;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category({MiscTests.class, MediumTests.class})
+public class TestConnectionCache extends TestCase {
+  private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+
+  /**
+   * test for ConnectionCache cleaning expired HConnection
+   */
+  @Test
+  public void testConnectionChore() throws Exception {
+    UTIL.startMiniCluster();
+
+    //1s for clean interval & 5s for maxIdleTime
+    ConnectionCache cache = new ConnectionCache(UTIL.getConfiguration(),
+        UserProvider.instantiate(UTIL.getConfiguration()), 1000, 5000);
+    ConnectionCache.ConnectionInfo info = cache.getCurrentConnection();
+
+    assertEquals(false, info.connection.isClosed());
+
+    Thread.sleep(7000);
+
+    assertEquals(true, info.connection.isClosed());
+    UTIL.shutdownMiniCluster();
+  }
+
+}
+