diff --git a/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java b/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
index b479e5f0923..2222d2e38ed 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
@@ -333,4 +333,9 @@ public class TestAcidGuarantees {
   private void setConf(Configuration c) {
     util = new HBaseTestingUtility(c);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestCompare.java b/src/test/java/org/apache/hadoop/hbase/TestCompare.java
index 36ad4d10a9f..a9e2509df53 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestCompare.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestCompare.java
@@ -54,4 +54,9 @@ public class TestCompare extends TestCase {
     b = new HRegionInfo(t.getName(), Bytes.toBytes("aaaa"), Bytes.toBytes("eeee"));
     assertTrue(a.compareTo(b) < 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java b/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
index 53260ef4d21..0d992cbb879 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestDrainingServer.java
@@ -197,4 +197,9 @@ public class TestDrainingServer {
     return TEST_UTIL.getMiniHBaseCluster().countServedRegions() ==
       (COUNT_OF_REGIONS + 2 /*catalog regions*/);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java b/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
index fcca13ff109..6bc7c32b343 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
@@ -71,4 +71,9 @@ public class TestFSTableDescriptorForceCreation {
     assertTrue("Should create new table descriptor",
       FSTableDescriptors.createTableDescriptor(fs, rootdir, htd, true));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index 1abcd76a4e7..6e8e8d4b6e6 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -122,4 +122,9 @@ public class TestFullLogReconstruction {
     }
     assertEquals(count, newCount);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java b/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
index 1380c3d4ea9..756fc3b691a 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
@@ -174,4 +174,8 @@ public class TestGlobalMemStoreSize {
       } catch (InterruptedException e) {}
     }
   }
-}
\ No newline at end of file
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
+}
diff --git a/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
index 4200791d923..bbb20ff49a0 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
@@ -227,4 +227,9 @@ public class TestHBaseTestingUtility {
     assertTrue(fs.mkdirs(testdir));
     assertTrue(hbt.cleanupTestDir());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java b/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
index fc87a240cce..a9b8f9458be 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java
@@ -78,4 +78,9 @@ public class TestHRegionLocation {
     int compare2 = hsl2.compareTo(hsl1);
     assertTrue((compare1 > 0)? compare2 < 0: compare2 > 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestHServerAddress.java b/src/test/java/org/apache/hadoop/hbase/TestHServerAddress.java
index 7394f9415f6..1a6933752cf 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestHServerAddress.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestHServerAddress.java
@@ -82,4 +82,9 @@ public class TestHServerAddress {
       (HServerAddress)Writables.getWritable(bytes, new HServerAddress());
     assertNotSame(hsa1, deserialized);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestHServerInfo.java b/src/test/java/org/apache/hadoop/hbase/TestHServerInfo.java
index 3aad715b4c2..478022109cc 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestHServerInfo.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestHServerInfo.java
@@ -96,4 +96,9 @@ public class TestHServerInfo {
     int compare2 = hsi2.compareTo(hsi1);
     assertTrue((compare1 > 0)? compare2 < 0: compare2 > 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
index 06eed5aa2c3..124fe601170 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
@@ -108,4 +108,9 @@ public class TestInfoServers {
     assertTrue("expected=" + expected + ", content=" + content,
       content.contains(expected));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java b/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
index 7af4db47a4f..dc4ee8dba38 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java
@@ -372,4 +372,9 @@ public class TestKeyValue extends TestCase {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java b/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
index 78d0eeda7d2..df9a772259d 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
@@ -320,4 +320,9 @@ public class TestMultiVersions {
       s.close();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java b/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
index 7f7d20de33d..10863c03f20 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
@@ -216,4 +216,9 @@ public class TestRegionRebalancing {
       } catch (InterruptedException e) {}
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestSerialization.java b/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
index ec7f2dbcc47..0d7d0d2ead8 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
@@ -575,4 +575,9 @@ public class TestSerialization {
         HConstants.REPLICATION_SCOPE_LOCAL));
     return htd;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestServerName.java b/src/test/java/org/apache/hadoop/hbase/TestServerName.java
index 12f745bb0cd..eaa60c490bd 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestServerName.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestServerName.java
@@ -81,4 +81,9 @@ public class TestServerName {
     assertNotSame(5677,
       ServerName.getServerStartcodeFromServerName(sn.toString()));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index 3f84744bcbb..fb916741a38 100644
--- a/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -274,4 +274,9 @@ public class TestZooKeeper {
 
     ZKUtil.createAndFailSilent(zk2, aclZnode);
  }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java b/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
index b1f01562bb6..8915f6f10ad 100644
--- a/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
+++ b/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
@@ -231,4 +231,9 @@ public class TestAvroServer {
     impl.disableTable(tableAname);
     impl.deleteTable(tableAname);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/avro/TestAvroUtil.java b/src/test/java/org/apache/hadoop/hbase/avro/TestAvroUtil.java
index a7e3bffdbd5..80c859129db 100644
--- a/src/test/java/org/apache/hadoop/hbase/avro/TestAvroUtil.java
+++ b/src/test/java/org/apache/hadoop/hbase/avro/TestAvroUtil.java
@@ -40,4 +40,9 @@ public class TestAvroUtil {
     Assert.assertNotNull(aresult);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java b/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
index 8c18c0b7c55..dada051ba5a 100644
--- a/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
+++ b/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTracker.java
@@ -479,4 +479,9 @@ public class TestCatalogTracker {
       this.ct.waitForRoot();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java b/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
index 4952519fc55..fe371565a0f 100644
--- a/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
+++ b/src/test/java/org/apache/hadoop/hbase/catalog/TestCatalogTrackerOnCluster.java
@@ -73,4 +73,9 @@ public class TestCatalogTrackerOnCluster {
 
     UTIL.shutdownMiniCluster();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java b/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
index 8c02e6528dd..374c7e421a3 100644
--- a/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
+++ b/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditor.java
@@ -285,4 +285,9 @@ public class TestMetaReaderEditor {
     assertEquals(region.getEncodedName(),
       pair.getFirst().getEncodedName());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java b/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java
index 0919cfe325f..00424683f93 100644
--- a/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java
+++ b/src/test/java/org/apache/hadoop/hbase/catalog/TestMetaReaderEditorNoCluster.java
@@ -170,4 +170,9 @@ public class TestMetaReaderEditorNoCluster {
       zkw.close();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
index a758a69dc46..95712dd0670 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
@@ -1486,4 +1486,7 @@ public class TestAdmin {
     }
   }
 
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java b/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
index 0ee6ad72539..4821ceaf06a 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
@@ -153,4 +153,9 @@ public class TestAttributes {
     Assert.assertTrue(del.getAttributesMap().isEmpty());
     Assert.assertNull(del.getAttributesMap().get("attribute1"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 896b345a635..5265a2a59e9 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -4448,4 +4448,9 @@ public class TestFromClientSide {
         System.currentTimeMillis() + ", cur=" + store.getNumberOfstorefiles());
     assertEquals(count, store.getNumberOfstorefiles());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index bea5bc9513a..93c59ef4899 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -106,4 +106,9 @@ public class TestGet {
     Assert.assertTrue(get.getAttributesMap().isEmpty());
     Assert.assertNull(get.getAttributesMap().get("attribute1"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java b/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
index 692e606df92..3ce28b45413 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java
@@ -267,4 +267,9 @@ public class TestHCM {
     assertTrue(c1 != c3);
     assertTrue(c2 != c3);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java b/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
index a528edc4bf7..5ab918ea44f 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
@@ -351,4 +351,8 @@ public class TestHTablePool {
 					pool.getCurrentPoolSize(Bytes.toString(TABLENAME)));
 		}
 	}
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java b/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java
index 53629e77ae2..cab991e37a9 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java
@@ -125,4 +125,9 @@ public class TestHTableUtil {
    assertEquals(count, rows.size());
  }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChange.java b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChange.java
index 2d92970b7dc..74e55feb83f 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChange.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChange.java
@@ -462,4 +462,8 @@ public class TestInstantSchemaChange extends InstantSchemaChangeTestBase {
   }
 
 
-}
\ No newline at end of file
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
+}
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeFailover.java b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeFailover.java
index f08bad90332..2f3a18cd9c7 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeFailover.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeFailover.java
@@ -300,6 +300,11 @@ public class TestInstantSchemaChangeFailover {
     return ht;
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeSplit.java b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeSplit.java
index 3271b0c3b0c..07562b7055c 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeSplit.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestInstantSchemaChangeSplit.java
@@ -212,6 +212,11 @@ public class TestInstantSchemaChangeSplit extends InstantSchemaChangeTestBase {
   }
       
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java b/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java
index 3e8c74022be..5adb3c896af 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestMetaMigrationRemovingHTD.java
@@ -351,4 +351,9 @@ public class TestMetaMigrationRemovingHTD {
     }
     return count;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java b/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
index 3aa8e1b5c7a..997e76fc423 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java
@@ -94,4 +94,9 @@ public class TestMetaScanner {
     verify(visitor, times(1)).processRow((Result)anyObject());
         
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
index a8ff288a0cf..de00271185c 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java
@@ -496,4 +496,9 @@ public class TestMultiParallel {
       validateEmpty(result);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java b/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
index d89c4c2979d..3a7cdbfa8c6 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java
@@ -515,5 +515,10 @@ public class TestMultipleTimestamps {
     del.deleteFamily(cf);
     ht.delete(del);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java b/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
index 8e658bcbe99..716022d7d40 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
@@ -131,4 +131,9 @@ public class TestOperation {
     assertEquals("Qualifier incorrect in Delete.toJSON()", 
         Bytes.toStringBinary(QUALIFIER), kvMap.get("qualifier"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestResult.java b/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
index f174612cc92..f9e29c267e3 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestResult.java
@@ -121,4 +121,9 @@ public class TestResult extends TestCase {
       assertTrue(x.getMessage().startsWith("This result was different:"));
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestScan.java b/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
index d6443254e95..cdb40bb526d 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -106,4 +106,9 @@ public class TestScan {
     Assert.assertTrue(scan.getAttributesMap().isEmpty());
     Assert.assertNull(scan.getAttributesMap().get("attribute1"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java b/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
index 42bf8e0c416..814a3247139 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java
@@ -212,4 +212,9 @@ public class TestScannerTimeout {
     LOG.info("END ************ END test3686b");
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestShell.java b/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
index 5524ed8650a..624913bdf87 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestShell.java
@@ -69,4 +69,9 @@ public class TestShell {
     // Start all ruby tests
     jruby.runScriptlet(PathType.ABSOLUTE, "src/test/ruby/tests_runner.rb");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java b/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
index a1abd8fdc59..46021c0d582 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java
@@ -376,5 +376,10 @@ public class TestTimestampsFilter {
     del.deleteColumn(cf, column, version);
     ht.delete(del);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java b/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
index f530a3ed336..6dabc27266b 100644
--- a/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
+++ b/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java
@@ -114,4 +114,9 @@ public class TestReplicationAdmin {
     admin.removePeer(ID_ONE);
     assertEquals(1, admin.getPeersCount());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java
index 4384a31a9f0..06f79c1f542 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java
@@ -784,4 +784,9 @@ public class TestAggregateProtocol {
     std = aClient.std(TEST_TABLE, ci, scan);
     assertEquals(Double.NaN, std, 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
index b579b29f6d6..368a0e52498 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
@@ -534,4 +534,9 @@ public class TestClassLoading {
             TEST_UTIL.getHBaseCluster().getMaster().getCoprocessors());
     assertEquals(loadedMasterCoprocessorsVerify, loadedMasterCoprocessors);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
index 96d4517111e..3a3f17d433f 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
@@ -208,4 +208,9 @@ public class TestCoprocessorEndpoint {
     }
     return ret;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
index 3e14626a4b3..545d107cbb0 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java
@@ -344,6 +344,11 @@ public class TestCoprocessorInterface extends HBaseTestCase {
     assertTrue(i == 2);
     return regions;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
index 7fd49e95127..0e0b4228d2c 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java
@@ -222,4 +222,9 @@ public class TestMasterCoprocessorExceptionWithAbort {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
index c92159dd477..d7e0f65e3bc 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java
@@ -215,4 +215,9 @@ public class TestMasterCoprocessorExceptionWithRemove {
       fail("Failed to create table after buggy coprocessor removal: " + e);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
index d82022f53d2..c45689ffda3 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java
@@ -707,4 +707,9 @@ public class TestMasterObserver {
     assertTrue("Coprocessor should be called on region rebalancing",
         cp.wasBalanceCalled());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java
index 6a54420a922..ec415ba6056 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java
@@ -190,4 +190,9 @@ public class TestRegionObserverBypass {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
index e4439c168b6..1b02b2519cf 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java
@@ -411,5 +411,10 @@ public class TestRegionObserverInterface {
     }
     return ret;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
index 03b42639fe4..002d611a439 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java
@@ -134,4 +134,9 @@ public class TestRegionObserverStacking extends TestCase {
     assertTrue(idA < idB);
     assertTrue(idB < idC);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
index b409bdc9a62..8da7d005278 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java
@@ -169,4 +169,9 @@ public class TestRegionServerCoprocessorExceptionWithAbort {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
index c6e265f0e97..5d6115b9a6c 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java
@@ -135,4 +135,9 @@ public class TestRegionServerCoprocessorExceptionWithRemove {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
index 46536f6aa45..36dd28938a7 100644
--- a/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
+++ b/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
@@ -405,5 +405,10 @@ public class TestWALObserver {
     return htd;
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java b/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java
index 24fb13f757b..805421f7a4b 100644
--- a/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java
+++ b/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java
@@ -174,4 +174,9 @@ public class TestExecutorService {
       counter.incrementAndGet();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java b/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java
index 7b0f0becc8d..9007f074aa3 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java
@@ -64,4 +64,9 @@ public class TestBitComparator extends TestCase {
     BitComparator comparator = new BitComparator(comparatorBytes, operator);
     assertEquals(comparator.compareTo(data), expected);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java
index 64a7f3f8404..e26ce7e383a 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java
@@ -94,4 +94,9 @@ public class TestColumnPaginationFilter extends TestCase
     }
 
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
index a80bd48c6da..333766c4b05 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java
@@ -184,4 +184,9 @@ public class TestColumnPrefixFilter {
     List<String> wordList = new ArrayList<String>(wordSet);
     return wordList;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
index 33f0abd632d..e8baaa499ee 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java
@@ -113,8 +113,13 @@ class StringRange {
 
     return afterStart && beforeEnd;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
 @Category(MediumTests.class)
 public class TestColumnRangeFilter {
 
@@ -250,4 +255,9 @@ public class TestColumnRangeFilter {
     List<String> wordList = new ArrayList<String>(wordSet);
     return wordList;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
index 3afcd06f1c8..8e13a5b34ef 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java
@@ -242,4 +242,9 @@ public class TestDependentColumnFilter extends TestCase {
       filter.filterRow(accepted);
       assertEquals("check cell retention", 2, accepted.size());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
index 36c84094203..0e19d4d1b4a 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java
@@ -1516,4 +1516,9 @@ public class TestFilter extends HBaseTestCase {
       verifyScanFullNoValues(s, expectedKVs, useLen);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java b/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
index a251d48344e..2b69a6fb0fd 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java
@@ -328,4 +328,9 @@ public class TestFilterList extends TestCase {
     assertEquals(0, KeyValue.COMPARATOR.compare(filterList.getNextKeyHint(null),
         minKeyValue));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java
index 595a90e1391..a12bd8eaa16 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java
@@ -89,4 +89,9 @@ public class TestInclusiveStopFilter extends TestCase {
 
     assertFalse("Filter a null", filter.filterRowKey(null, 0, 0));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java
index b7f5093c268..cd555bcaaac 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java
@@ -248,5 +248,10 @@ public class TestMultipleColumnPrefixFilter {
     List<String> wordList = new ArrayList<String>(wordSet);
     return wordList;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
 
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java
index 8780caa5aef..ee9a9611a5d 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java
@@ -90,4 +90,9 @@ public class TestPageFilter extends TestCase {
     }
     assertEquals(pageSize, count);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java
index 2db9555f35f..61277e12f0f 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java
@@ -657,4 +657,9 @@ public class TestParseFilter {
     assertEquals(clazz, filter.getClass());
     return clazz.cast(filter);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java
index 0d78f478427..24a999e51d6 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java
@@ -100,4 +100,9 @@ public class TestPrefixFilter extends TestCase {
   private byte [] createRow(final char c) {
     return Bytes.toBytes(HOST_PREFIX + Character.toString(c));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java
index 74c264c07e4..7731cd9ccbc 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java
@@ -91,4 +91,9 @@ public class TestRandomRowFilter extends TestCase {
 
     return newFilter;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java
index d16ac4008ff..b7cb6b5211b 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java
@@ -78,4 +78,9 @@ public class TestSingleColumnValueExcludeFilter extends TestCase {
     assertTrue("otherColumn", filter.filterKeyValue(kv) == Filter.ReturnCode.NEXT_ROW);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java b/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java
index bfafb33b997..2a0751c587e 100644
--- a/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java
@@ -171,4 +171,9 @@ public class TestSingleColumnValueFilter extends TestCase {
     newFilter = serializationTest(regexFilter);
     regexFilterTests(newFilter);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java b/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
index 1d367083322..6e01e9527b4 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java
@@ -145,4 +145,9 @@ public class TestHalfStoreFileReader {
   }
 
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java b/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
index 3806108e9ad..78513ceebd0 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/TestHbaseObjectWritable.java
@@ -262,4 +262,9 @@ public class TestHbaseObjectWritable extends TestCase {
       this.key = Text.readString(in);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java b/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
index 1643fcf736e..8b7d016b001 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
@@ -324,4 +324,9 @@ public class TestHeapSize extends TestCase {
     assertEquals(ClassSize.estimateBase(SchemaConfigured.class, true),
         sc.heapSize());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java b/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java
index 4279dace75b..6217dec3da3 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java
@@ -132,4 +132,9 @@ public class TestImmutableBytesWritable extends TestCase {
       "Comparing " + a + " and " + b + " as objects (inverse)",
       -signum(comparator.compare(b, a)), expectedSignum);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheColumnFamilySummary.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheColumnFamilySummary.java
index 58f3d01788b..76738063721 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheColumnFamilySummary.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheColumnFamilySummary.java
@@ -120,4 +120,9 @@ public class TestBlockCacheColumnFamilySummary {
     assertEquals("mapSize",1,bcs.size());
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
index 58fd1552879..9adf18b2465 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
@@ -235,4 +235,9 @@ public class TestCacheOnWrite {
     storeFilePath = sfw.getPath();
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
index c524bbe4b75..748eaae7199 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
@@ -151,4 +151,9 @@ public class TestCachedBlockQueue extends TestCase {
           }, accessTime, false);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
index 9847af465c0..1d0f2cffd7c 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java
@@ -225,4 +225,9 @@ public class TestFixedFileTrailer {
         loaded.getTotalUncompressedBytes());
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
index bba1b50994b..da0067f922d 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java
@@ -302,4 +302,9 @@ public class TestHFile extends HBaseTestCase {
     writer.close();
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
index edfd48cda1e..742ffe8ed84 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java
@@ -515,4 +515,9 @@ public class TestHFileBlock {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
index 7e88f1c5f44..0422fe72c24 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java
@@ -600,4 +600,9 @@ public class TestHFileBlockIndex {
         valueRead);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
index ac6d0497e89..53fa42b3b10 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java
@@ -386,4 +386,9 @@ public class TestHFilePerformance extends TestCase {
             " the same method several times and flood cache every time and average it to get a" +
             " better number.");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
index 292b9830dcf..c745ffcb9e1 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
@@ -100,4 +100,9 @@ public class TestHFileReaderV1 {
     reader.close();
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
index 2bb16cb92de..a44d656d07c 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java
@@ -533,4 +533,9 @@ public class TestHFileSeek extends TestCase {
       testCase.tearDown();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java
index 371195fc354..474cbcf973f 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java
@@ -296,4 +296,9 @@ public class TestHFileWriterV2 {
         randomValue(rand));
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
index 1a5bd2150b6..081c662c736 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
@@ -689,4 +689,9 @@ public class TestLruBlockCache {
     }
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
index b9a25157b53..efeba1f168c 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java
@@ -89,4 +89,9 @@ public class TestReseekTo {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
index 9a092c310cb..ffa971ac575 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java
@@ -145,4 +145,9 @@ public class TestSeekTo extends HBaseTestCase {
     assertEquals(1, blockIndexReader.rootBlockContainingKey(
         toKV("l").getKey(), 0, klen));
  }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSingleSizeCache.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSingleSizeCache.java
index bd6cb607a55..4f21fbdff63 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSingleSizeCache.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSingleSizeCache.java
@@ -79,4 +79,9 @@ public class TestSingleSizeCache {
     CacheTestUtils.testHeapSizeChanges(cache, BLOCK_SIZE);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlab.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlab.java
index dc90bc0e82e..124d131849c 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlab.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlab.java
@@ -73,4 +73,9 @@ public class TestSlab {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java
index c15d64710d7..a02f109515e 100644
--- a/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java
+++ b/src/test/java/org/apache/hadoop/hbase/io/hfile/slab/TestSlabCache.java
@@ -107,4 +107,9 @@ public class TestSlabCache {
   public void testHeapSizeChanges(){
     CacheTestUtils.testHeapSizeChanges(cache, BLOCK_SIZE);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java b/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
index 3141f9bc55f..5229b6d0500 100644
--- a/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
+++ b/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java
@@ -310,4 +310,9 @@ public class TestDelayedRpc {
       return new ProtocolSignature(clientVersion, new int [] {});
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java b/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
index 0b60d47b894..5956169c20b 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
@@ -335,4 +335,9 @@ public class TestTableInputFormat {
     HTable htable = createDNRIOEScannerTable("table3-mr".getBytes());
     runTestMapreduce(htable);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java b/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
index 5e9c299350c..26a6f610f09 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java
@@ -254,4 +254,9 @@ public class TestTableMapReduce {
       scanner.close();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
index 9be934f2cb9..40cd93348f4 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java
@@ -797,4 +797,9 @@ public class TestHFileOutputFormat  {
           "usage: TestHFileOutputFormat newtable | incremental");
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
index a249c679b85..dd6c98d8044 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
@@ -256,4 +256,9 @@ public class TestImportTsv {
   public static String toU8Str(byte[] bytes) throws UnsupportedEncodingException {
     return new String(bytes, HConstants.UTF8_ENCODING);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
index e1a6d516b16..6e6c1dc4420 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java
@@ -287,4 +287,9 @@ public class TestLoadIncrementalHFiles {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
index 6d73d1f44fe..21fa495d69b 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java
@@ -367,4 +367,9 @@ public class TestLoadIncrementalHFilesSplitRecovery {
 
     fail("doBulkLoad should have thrown an exception");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
index 3c456f06dee..7ec759a391c 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
@@ -66,4 +66,9 @@ public class TestSimpleTotalOrderPartitioner extends HBaseTestCase {
     partition = p.getPartition(endBytes, HConstants.EMPTY_BYTE_ARRAY, 3);
     assertEquals(2, partition);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
index 3ad1f33cbcc..46e1bee95bb 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan.java
@@ -344,4 +344,9 @@ public class TestTableInputFormatScan {
     assertTrue(job.isComplete());
     LOG.info("After map/reduce completion - job " + jobName);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
index 689ad0ad363..9268d6d4688 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java
@@ -277,4 +277,9 @@ public class TestTableMapReduce {
     tmpjars = job.getConfiguration().get("tmpjars");
     assertTrue(tmpjars.contains("guava"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java
index d8298822f4b..ded4dd65583 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java
@@ -39,4 +39,9 @@ public class TestTableSplit {
     set.add(split2);
     assertTrue(set.size() == 1);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
index f842d9eb116..6e3bdc240a6 100644
--- a/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
+++ b/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
@@ -210,4 +210,9 @@ public class TestTimeRangeMapRed {
     }
     scanner.close();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java b/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
index 12102e51a64..16e4744d52e 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java
@@ -281,4 +281,9 @@ public class TestActiveMasterManager {
       return null;
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java b/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
index b3fcb3e9fc6..cc0f30f4065 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManager.java
@@ -177,4 +177,8 @@ public class TestAssignmentManager {
     // Unassign region.
     am.unassign(hri);
   }
-}
\ No newline at end of file
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
+}
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java b/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
index 0ece0bded00..c359f4b8da2 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java
@@ -519,4 +519,9 @@ public class TestCatalogJanitor {
     htd.addFamily(new HColumnDescriptor("f"));
     return htd;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java b/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
index f9d26b9f388..977a5c7a756 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java
@@ -95,4 +95,9 @@ public class TestClockSkewDetection {
       LOG.info("Recieved expected exception: "+e);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java b/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
index 1392ead9178..d24c8798e68 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java
@@ -58,4 +58,9 @@ public class TestDeadServer {
     assertFalse(ds.isDeadServer(deadServer));
     assertFalse(ds.cleanPreviousInstance(deadServerHostComingAlive));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestDefaultLoadBalancer.java b/src/test/java/org/apache/hadoop/hbase/master/TestDefaultLoadBalancer.java
index 65969da1403..40721cc0198 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestDefaultLoadBalancer.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestDefaultLoadBalancer.java
@@ -505,4 +505,9 @@ public class TestDefaultLoadBalancer {
   private void returnServers(List<ServerName> servers) {
     this.serverQueue.addAll(servers);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
index d472292148d..5aa298471af 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
@@ -440,4 +440,9 @@ public class TestDistributedLogSplitting {
     }
     assertTrue(false);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java b/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java
index 7bd35ff024d..9ff83c50e0f 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java
@@ -59,4 +59,9 @@ public class TestHMasterRPCException {
       fail("Unexpected throwable: " + t);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java b/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
index 4aceacdc97b..ffda68d0f17 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestLogsCleaner.java
@@ -173,4 +173,9 @@ public class TestLogsCleaner {
       return false;
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java b/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
index d1f03252a26..39ced1e2090 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
@@ -141,4 +141,9 @@ public class TestMaster {
     public void beforeProcess(EventHandler event) {
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java b/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
index 61c0469a1bb..c86dc7f433a 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java
@@ -994,4 +994,9 @@ public class TestMasterFailover {
   private void log(String string) {
     LOG.info("\n\n" + string + " \n\n");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java b/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
index 8de22cb8a64..86fbada40ca 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
@@ -127,4 +127,9 @@ public class TestMasterRestartAfterDisablingTable {
     }
     return online;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java b/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
index 90bfd3413fa..30ae515aafc 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java
@@ -191,4 +191,9 @@ public class TestMasterStatusServlet {
     }
     assertEquals(50, count);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java b/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
index 26faa656f78..f73857dc89a 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
@@ -532,4 +532,9 @@ public class TestMasterTransitions {
   private static byte [] getTestQualifier() {
     return getTestFamily();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestOpenedRegionHandler.java b/src/test/java/org/apache/hadoop/hbase/master/TestOpenedRegionHandler.java
index e1f98af1bf1..6633a20b9fe 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestOpenedRegionHandler.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestOpenedRegionHandler.java
@@ -206,4 +206,9 @@ public class TestOpenedRegionHandler {
   private void log(String msg) {
     LOG.debug("\n\nTRR: " + msg + "\n");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java b/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
index 9185c1e6eec..ed3208c5ea7 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java
@@ -130,4 +130,9 @@ public class TestRestartCluster {
       UTIL.waitTableAvailable(TABLE, 30000);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java b/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
index 4e573605a2d..49f1196b42c 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
@@ -407,4 +407,9 @@ public class TestRollingRestart {
     return doubled;
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java b/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
index be7e25b6fb3..32ad7e8ffb9 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java
@@ -418,4 +418,9 @@ public class TestSplitLogManager {
         taskstate));
     return;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java b/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
index 6267404425c..6c43e1a0c9b 100644
--- a/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
+++ b/src/test/java/org/apache/hadoop/hbase/master/TestZKBasedOpenCloseRegion.java
@@ -391,4 +391,9 @@ public class TestZKBasedOpenCloseRegion {
 
     TestZKBasedOpenCloseRegion.afterAllTests();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java b/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
index efc688ab69d..a6c771e9fd8 100644
--- a/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
+++ b/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
@@ -122,4 +122,9 @@ public class TestMetricsMBeanBase extends TestCase {
     assertEquals(attr.getDescription(), description);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/migration/TestMigrationFrom090To092.java b/src/test/java/org/apache/hadoop/hbase/migration/TestMigrationFrom090To092.java
index 19ed74b9191..c3651ac156d 100644
--- a/src/test/java/org/apache/hadoop/hbase/migration/TestMigrationFrom090To092.java
+++ b/src/test/java/org/apache/hadoop/hbase/migration/TestMigrationFrom090To092.java
@@ -54,4 +54,9 @@ public class TestMigrationFrom090To092 {
     htd.addFamily(new HColumnDescriptor("family"));
     return htd;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java b/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java
index 8f23441ba42..ac76887569c 100644
--- a/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java
+++ b/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java
@@ -71,4 +71,9 @@ public class TestMemoryBoundedLogMessageBuffer {
     String dump = sw.toString();
     assertTrue(dump.contains(JP_TEXT));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java b/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
index 076c3dec51c..98de0247b99 100644
--- a/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
+++ b/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java
@@ -101,4 +101,9 @@ public class TestTaskMonitor {
     assertEquals("task 10", tm.getTasks().get(0).getDescription());
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
index f8eb06ab2d0..42db18b6298 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java
@@ -240,4 +240,9 @@ public class TestAtomicOperation extends HBaseTestCase {
   }
 
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
index a68c383567d..6ccb109098e 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java
@@ -421,4 +421,8 @@ public class TestBlocksRead extends HBaseTestCase {
     assertEquals(1, kvs.length);
     verifyData(kvs[0], "row", "col99", 201);
 	}
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
index 9a3e06b4d7b..3a9c9fb38b2 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java
@@ -290,4 +290,9 @@ public class TestColumnSeeking {
     List<String> wordList = new ArrayList<String>(wordSet);
     return wordList;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSelection.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSelection.java
index b2aa34058ef..f5b4c3ca699 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSelection.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSelection.java
@@ -270,4 +270,9 @@ public class TestCompactSelection extends TestCase {
         hourMinusTwo + ", " + hourMinusOne + ")");
     compactEquals(sfCreate(999,50,12,12, 1), 12, 12, 1);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
index ab26f54b1d8..6b2221b1259 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java
@@ -519,4 +519,9 @@ public class TestCompaction extends HBaseTestCase {
     fail("testCompactionWithCorruptResult failed since no exception was" +
         "thrown while completing a corrupt file");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java
index b6a060da725..d6570ec4d7f 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java
@@ -358,4 +358,9 @@ public class TestCompoundBloomFilter {
     assertEquals(0, rowKV.getQualifier().length);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index 9f5b2a874eb..10abd0d951b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -126,4 +126,9 @@ public class TestEndToEndSplitTransaction {
     }
     return true;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java
index f279f091a4a..ce500a67ab5 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java
@@ -196,4 +196,9 @@ public class TestExplicitColumnTracker extends HBaseTestCase {
         ScanQueryMatcher.MatchCode.SEEK_NEXT_COL });
     runTest(1, columns, scanner, expected);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
index bb0e500e435..f42f124c055 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
@@ -238,4 +238,9 @@ public class TestFSErrorsExposed {
   }
 
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
index 49bfc5a0a97..5f97167543a 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java
@@ -340,4 +340,9 @@ public class TestGetClosestAtOrBefore extends HBaseTestCase {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 00bb18c9b99..3f4f6fce8af 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -3330,4 +3330,9 @@ public class TestHRegion extends HBaseTestCase {
                  "value-version-" + ts, Bytes.toString(kv.getValue()));
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
index 046a1f4b794..6e1211bd7d4 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java
@@ -129,4 +129,9 @@ public class TestHRegionInfo {
     assertTrue(HRegionInfo.ROOT_REGIONINFO.isMetaTable());
     assertTrue(HRegionInfo.FIRST_META_REGIONINFO.isMetaTable());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
index 020b76539d2..3a676c51cae 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
@@ -310,4 +310,9 @@ public class TestHRegionServerBulkLoad {
   private void setConf(Configuration c) {
     UTIL = new HBaseTestingUtility(c);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
index 0ae2960391a..72d9c405a18 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java
@@ -753,4 +753,9 @@ public class TestKeepDeletes extends HBaseTestCase {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java
index 718f53e1979..69f57ee9836 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java
@@ -227,4 +227,9 @@ public class TestKeyValueHeap extends HBaseTestCase {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java
index a8a7b2c5c54..1cc893a519b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java
@@ -66,4 +66,9 @@ public class TestKeyValueScanFixture extends TestCase {
     assertEquals(null, scan.peek());
     assertEquals(null, scan.next());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java
index baf1c7e62f7..d9158bebf9c 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java
@@ -147,4 +147,9 @@ public class TestKeyValueSkipListSet extends TestCase {
     head = this.kvsls.headSet(splitter);
     assertTrue(Bytes.equals(head.first().getValue(), value2));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
index 4ee1261bae2..e91d83caef7 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressManager.java
@@ -113,4 +113,9 @@ public class TestMasterAddressManager {
       lock.acquire();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
index c1336c38c50..a092cf0babb 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
@@ -967,4 +967,9 @@ public class TestMemStore extends TestCase {
   }
 
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java
index 220fd76831f..d7b01ca72ea 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java
@@ -173,4 +173,9 @@ public class TestMemStoreLAB {
     }
     
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java
index 2ebde91acbd..1a2979bdfde 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java
@@ -418,4 +418,9 @@ public class TestMinVersions extends HBaseTestCase {
       assertEquals(kvs.get(i).getValue(), vals[i]);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
index a2a70e0ac1a..b599513a69a 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
@@ -380,4 +380,9 @@ public class TestMultiColumnScanner {
     return lst;
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java
index 84226bd5397..3b0ededbb1e 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java
@@ -244,4 +244,9 @@ public class TestParallelPut extends HBaseTestCase {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
index 7d4b748e142..2666469296f 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
@@ -272,4 +272,9 @@ public class TestQueryMatcher extends HBaseTestCase {
       assertEquals(expected[i], actual.get(i));
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
index bbeecd932ec..64e61bb6806 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
@@ -89,4 +89,9 @@ public class TestRSStatusServlet {
   }
   
   
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestReadWriteConsistencyControl.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestReadWriteConsistencyControl.java
index 5c09a7e560b..fd4583360da 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestReadWriteConsistencyControl.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestReadWriteConsistencyControl.java
@@ -128,4 +128,9 @@ public class TestReadWriteConsistencyControl extends TestCase {
 
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
index ae605bf89b8..3447aeb6336 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
@@ -121,4 +121,9 @@ public class TestRegionServerMetrics {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java
index c86fb27ed55..47d07d6d52d 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java
@@ -138,4 +138,9 @@ public class TestRegionSplitPolicy {
     assertEquals("store 2 split",
         Bytes.toString(policy.getSplitPoint()));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
index 80362c918a2..c98efe50eec 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java
@@ -97,4 +97,9 @@ public class TestResettingCounters {
     region.close();
     region.getLog().closeAndDelete();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRpcMetrics.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRpcMetrics.java
index 7821669d8f9..0a90f0f48ca 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestRpcMetrics.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestRpcMetrics.java
@@ -134,4 +134,9 @@ public class TestRpcMetrics {
   public boolean wasSet(String name) {
     return METRICS.get(name) != null ? METRICS.get(name) : false;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java
index ff406f227fa..13ed753a43a 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java
@@ -110,4 +110,9 @@ public class TestScanDeleteTracker extends HBaseTestCase {
     assertEquals(false ,sdt.isEmpty());
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
index ec306cb2794..27dca004374 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java
@@ -122,4 +122,9 @@ public class TestScanWildcardColumnTracker extends HBaseTestCase {
     assertEquals(true, ok);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
index d3b355e6bd5..3ac759774cc 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
@@ -201,4 +201,9 @@ public class TestScanWithBloomError {
     region.flushcache();
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
index 538bbea4e2f..2d87567c79c 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java
@@ -514,4 +514,9 @@ public class TestScanner extends HBaseTestCase {
     LOG.info("Found " + count + " items");
     return count;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
index dc96c45622a..5951f58bcdb 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java
@@ -436,4 +436,9 @@ public class TestSeekOptimizations {
         StoreScanner.LAZY_SEEK_ENABLED_BY_DEFAULT);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
index 95d3916d8d9..e99d2514a4d 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
@@ -366,4 +366,9 @@ public class TestServerCustomProtocol {
     assertEquals("Invalid result for row '"+Bytes.toStringBinary(row)+"'",
         expected, results.get(region));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
index 84d76e8babe..26b9865fd0b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java
@@ -307,4 +307,9 @@ public class TestSplitLogWorker {
     }
     assertEquals(2, num);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
index e1aed353408..8dc3d0c05e0 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java
@@ -299,4 +299,9 @@ public class TestSplitTransaction {
     return HRegion.openHRegion(testdir, hri, htd, wal,
       TEST_UTIL.getConfiguration());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
index 24903f3c205..1997abd531c 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java
@@ -454,4 +454,9 @@ public class TestSplitTransactionOnCluster {
       Thread.sleep(100);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
index 92ab06c0057..d3b9e86a93c 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
@@ -710,4 +710,9 @@ public class TestStore extends TestCase {
     assertNull(store.getSplitPoint());
     store.getHRegion().clearSplit_TESTS_ONLY();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
index 2bc0c59c827..e078630208b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
@@ -834,4 +834,9 @@ public class TestStoreFile extends HBaseTestCase {
     writer.close();
     return writer;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java
index 30286a30a4f..9bb507f3d4f 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileBlockCacheSummary.java
@@ -148,4 +148,9 @@ public class TestStoreFileBlockCacheSummary {
      throw new IOException("Incorrect number of rows!");
    }
  }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
index 07163f2e536..b90526cf5ce 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
@@ -572,4 +572,9 @@ public class TestStoreScanner extends TestCase {
     EnvironmentEdgeManagerTestHelper.reset();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java b/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
index ccd392f5ba4..5ce665371a6 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java
@@ -143,4 +143,9 @@ public class TestWideScanner extends HBaseTestCase {
       this.r.getLog().closeAndDelete();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestCloseRegionHandler.java b/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestCloseRegionHandler.java
index c7400df28dc..853a35f8910 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestCloseRegionHandler.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestCloseRegionHandler.java
@@ -86,4 +86,9 @@ public class TestCloseRegionHandler {
       assertTrue(server.isStopped());
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java b/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
index 200712f08b0..8988f83775e 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/handler/TestOpenRegionHandler.java
@@ -174,4 +174,9 @@ public class TestOpenRegionHandler {
     assertEquals(EventType.RS_ZK_REGION_FAILED_OPEN, data.getEventType());
   }
   
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java b/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java
index 1b983d5ad75..582693d74e7 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java
@@ -212,4 +212,9 @@ public class TestSchemaConfigured {
     assertEquals("cfName", sc4.getColumnFamilyName());
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java b/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
index d6b4618713c..dbe425f1ccb 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
@@ -244,4 +244,9 @@ public class TestSchemaMetrics {
     assertEquals(expected.toString(), result);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
index d6b88d4da34..9034844f013 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
@@ -771,4 +771,9 @@ public class TestHLog  {
       // not interested
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogBench.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogBench.java
index b3d36ad23aa..0b0a7cee11a 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogBench.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogBench.java
@@ -338,4 +338,9 @@ public class TestHLogBench extends Configured implements Tool {
     }
     System.exit(res);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java
index 43d721c391b..13f77ec3355 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java
@@ -163,4 +163,9 @@ public class TestHLogMethods {
     HLog.Entry entry = new HLog.Entry(key, edit);
     return entry;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
index eb67a01b590..f1ea70114b0 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
@@ -1371,4 +1371,9 @@ public class TestHLogSplit {
     }
     return true;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java
index a7da89ac03f..b6764bfa0af 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java
@@ -164,4 +164,9 @@ public class TestLogRollAbort {
           log.hasDeferredEntries());
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
index dfabcd0b05f..6e89cc4715b 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
@@ -549,4 +549,9 @@ public class TestLogRolling  {
       assertFalse(rsThread.getRegionServer().isAborted());
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java
index a6e540455db..de81e9170c7 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java
@@ -169,4 +169,9 @@ public class TestWALActionsListener {
     }
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
index 19a9ea97151..59910bfe37a 100644
--- a/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
+++ b/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
@@ -612,4 +612,9 @@ public class TestWALReplay {
     htd.addFamily(c);
     return htd;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
index 68016193619..9d7c9c186c1 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
@@ -322,4 +322,9 @@ public class TestMasterReplication {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java b/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java
index 422522be87c..147a3d25cd3 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java
@@ -248,4 +248,9 @@ public class TestMultiSlaveReplication {
       }
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java b/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
index 67308b7fa1b..3e8b8003e5d 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
@@ -600,4 +600,9 @@ public class TestReplication {
     killer.start();
     return killer;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeer.java b/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeer.java
index 25a9b25613d..51bd6fa54cb 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeer.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationPeer.java
@@ -74,4 +74,9 @@ public class TestReplicationPeer {
     Assert.fail("ReplicationPeer ZooKeeper session was not properly expired.");
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java b/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java
index a061ee6c114..20b8e6eab3b 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java
@@ -99,4 +99,9 @@ public class TestReplicationSource {
     assertNull(entry);
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java b/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
index 61d1216d6a8..18eb530fcff 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java
@@ -249,4 +249,9 @@ public class TestReplicationSink {
 
     return new HLog.Entry(key, edit);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java b/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
index 4699d628764..07b3f3c30f0 100644
--- a/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
@@ -244,4 +244,9 @@ public class TestReplicationSourceManager {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java b/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
index ec436e2529b..570adddb51b 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
@@ -149,4 +149,9 @@ public class TestGzipFilter {
     response = client.get(scannerUrl);
     assertEquals(response.getCode(), 204);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index 6594e8f3db6..c5b714370d4 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -168,4 +168,9 @@ public class TestMultiRowResource {
     assertEquals(response.getCode(), 404);
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java
index ffd029c3d60..b59436ca345 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestRowResource.java
@@ -525,4 +525,9 @@ public class TestRowResource {
       assertEquals(200, response.getCode());
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
index eb28cec86b1..6e5849b3038 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
@@ -343,4 +343,9 @@ public class TestScannerResource {
       "/scanner", Constants.MIMETYPE_XML, body);
     assertEquals(response.getCode(), 404);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java b/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
index 07915ed171e..8af3e61562e 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
@@ -991,4 +991,9 @@ public class TestScannersWithFilters {
     };
     verifyScanFull(s, kvs);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
index f3886c8c2e8..c967baba603 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
@@ -161,4 +161,9 @@ public class TestSchemaResource {
     // return read-only setting back to default
     conf.set("hbase.rest.readonly", "false");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
index 4a8bb69d16e..cffdcb67af9 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
@@ -110,4 +110,9 @@ public class TestStatusResource {
     model.getObjectFromMessage(response.getBody());
     validate(model);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
index 44abeaf5afe..b8e190b34c9 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
@@ -239,4 +239,9 @@ public class TestTableResource {
     model.getObjectFromMessage(response.getBody());
     checkTableInfo(model);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestTransform.java b/src/test/java/org/apache/hadoop/hbase/rest/TestTransform.java
index 75d7ec6526d..2e2ba4c4184 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestTransform.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestTransform.java
@@ -112,4 +112,9 @@ public class TestTransform {
     value = response.getBody();
     assertTrue(Bytes.equals(value, VALUE_2));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java b/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
index cc8c0cdb728..a416499caa3 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
@@ -163,4 +163,9 @@ public class TestVersionResource {
     Response response = client.get("/version/cluster", Constants.MIMETYPE_JSON);
     assertTrue(response.getCode() == 200);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java b/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java
index 5940cf2da9f..5a648aa45ad 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdmin.java
@@ -69,4 +69,9 @@ public class TestRemoteAdmin {
     remoteAdmin.deleteTable(TABLE_1);
     assertFalse(remoteAdmin.isTableAvailable(TABLE_1));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
index e48dcf94a90..7b7a67063f4 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
@@ -343,4 +343,9 @@ public class TestRemoteTable {
 
     scanner.close();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java
index a5921dbe79f..4e7a56bc6c6 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java
@@ -104,4 +104,9 @@ public class TestCellModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java
index d96fbae048d..3d358c065f8 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java
@@ -154,4 +154,9 @@ public class TestCellSetModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java
index 92a6a1fd288..62014a347f2 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java
@@ -102,4 +102,9 @@ public class TestColumnSchemaModel extends TestCase {
   public void testFromXML() throws Exception {
     checkModel(fromXML(AS_XML));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java
index 2b1dd8c5869..80386456ced 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java
@@ -93,4 +93,9 @@ public class TestRowModel extends TestCase {
   public void testFromXML() throws Exception {
     checkModel(fromXML(AS_XML));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
index 69a2f3746fd..dc55f3accfc 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java
@@ -128,4 +128,9 @@ public class TestScannerModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
index e6aec0979a7..32e91d921f7 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java
@@ -148,4 +148,9 @@ public class TestStorageClusterStatusModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java
index fd791c60ea8..3a014860f0a 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java
@@ -73,4 +73,9 @@ public class TestStorageClusterVersionModel extends TestCase {
   public void testFromXML() throws Exception {
     checkModel(fromXML(AS_XML));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java
index 47e9783bbf4..7fb74a7b79d 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java
@@ -116,4 +116,9 @@ public class TestTableInfoModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java
index 210c90f302e..a3d1bf98779 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java
@@ -107,4 +107,9 @@ public class TestTableListModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java
index 60e0e41ccce..b6f0ab5d4ba 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java
@@ -104,4 +104,9 @@ public class TestTableRegionModel extends TestCase {
   public void testFromXML() throws Exception {
     checkModel(fromXML(AS_XML));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java
index 9372f5edf1f..c9b29897315 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java
@@ -128,4 +128,9 @@ public class TestTableSchemaModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java b/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java
index 73688095796..2ecb7d90d86 100644
--- a/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java
+++ b/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java
@@ -112,4 +112,9 @@ public class TestVersionModel extends TestCase {
   public void testFromPB() throws Exception {
     checkModel(fromPB(AS_PB));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/security/TestUser.java b/src/test/java/org/apache/hadoop/hbase/security/TestUser.java
index 02ff6c6cc42..098787c726f 100644
--- a/src/test/java/org/apache/hadoop/hbase/security/TestUser.java
+++ b/src/test/java/org/apache/hadoop/hbase/security/TestUser.java
@@ -104,4 +104,9 @@ public class TestUser {
       assertEquals(user1.getName(), u.getName());
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java b/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
index ffa6ed5b59f..12247d030d8 100644
--- a/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
+++ b/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
@@ -460,4 +460,9 @@ public class TestThriftServer {
     handler.scannerGet(scannerId);
     handler.scannerClose(scannerId);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java b/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
index c9aa0d9e487..477141f2311 100644
--- a/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
+++ b/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java
@@ -227,4 +227,9 @@ public class TestThriftServerCmdLine {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java b/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
index d89cc2a8d7f..629378e3fe2 100644
--- a/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
+++ b/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java
@@ -512,4 +512,9 @@ public class TestThriftHBaseServiceHandler {
     } catch (TIllegalArgument e) {
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java b/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java
index dd69ebf153d..c55c4d4f87b 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java
@@ -67,4 +67,9 @@ public class TestBase64 extends TestCase {
       assertTrue(uris[i++].compareTo(e.getValue()) == 0);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java b/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java
index fee6fce3a79..2240018893f 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java
@@ -164,4 +164,9 @@ public class TestByteBloomFilter extends TestCase {
     assertEquals(640, ByteBloomFilter.computeFoldableByteSize(5001, 4));
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java b/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
index 9625c72c564..e7fea6c465f 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
@@ -290,4 +290,9 @@ public class TestBytes extends TestCase {
     assertEquals("", Bytes.readStringFixedSize(dis, 9));
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java b/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java
index b8d0c79f062..df783958b79 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java
@@ -128,4 +128,9 @@ public class TestCompressionTest {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java b/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
index 5ca87ba13fc..ea6903e8f48 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
@@ -50,4 +50,9 @@ public class TestDefaultEnvironmentEdge {
             secondEdgeTime > edgeTime);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java b/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
index 49cd37bba17..59b2c2bc5a2 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
@@ -63,4 +63,9 @@ public class TestEnvironmentEdgeManager {
     verify(mock).currentTimeMillis();
     assertEquals(expectation, result);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java b/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java
index ccf6fa4b4cb..744270410f7 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java
@@ -250,4 +250,9 @@ public class TestFSTableDescriptors {
       assertTrue(clist[i].equals(i == 0? farFuture: i == 1? future: bare));
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java b/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
index 54699892462..e2611e607d2 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java
@@ -146,4 +146,9 @@ public class TestFSUtils {
     
   }
   
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
index 0b6accef3ca..dfc4cd9d01e 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
@@ -344,4 +344,9 @@ public class TestHBaseFsck {
       deleteTable(table);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java b/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java
index 57e1cb31d52..0599da13eb4 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java
@@ -103,4 +103,9 @@ public class TestHBaseFsckComparator {
     assertTrue(HBaseFsck.cmp.compare(hi1, hi2) < 0);
     assertTrue(HBaseFsck.cmp.compare(hi2, hi1) > 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java b/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
index afd1323849a..478bfbdc54b 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
@@ -109,4 +109,9 @@ public class TestIdLock {
     }
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java b/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
index 52fbfaa1073..f4fbce953f4 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
@@ -41,4 +41,9 @@ public class TestIncrementingEnvironmentEdge {
     assertEquals(3, edge.currentTimeMillis());
     assertEquals(4, edge.currentTimeMillis());
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java b/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java
index 14494d08a1a..88f5821f9f4 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java
@@ -62,4 +62,9 @@ public class TestKeying extends TestCase {
     System.out.println("Original url " + u + ", Transformed url " + k);
     assertEquals(u, uri);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java b/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
index d33f4576ed0..a9948c7fe0a 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java
@@ -172,4 +172,9 @@ public class TestMergeTable {
     root.close();
     root.getLog().closeAndDelete();
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java b/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
index 59494729a08..465dc95292d 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
@@ -287,4 +287,9 @@ public class TestMergeTool extends HBaseTestCase {
       log.closeAndDelete();
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java b/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
index d4aa5be6562..bb4304c6afd 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
@@ -230,4 +230,9 @@ public class TestPoolMap {
     }
 
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java b/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
index bd570d5fd5d..ac3b2250f56 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
@@ -350,4 +350,9 @@ public class TestRegionSplitCalculator {
     assertEquals(res, ":\t[, A]\t\n" + "A:\t[A, B]\t\n" + "B:\t[B, ]\t\n"
         + "null:\t\n");
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java b/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
index 7bc0ab16dc2..2a72c715787 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
@@ -336,4 +336,9 @@ public class TestRegionSplitter {
         }
         return -1;
     }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java b/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java
index 924f1f8cd9a..c596018c331 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java
@@ -63,4 +63,9 @@ public class TestRootPath extends TestCase {
       LOG.info("Got expected exception when checking invalid path:", e);
     }
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java b/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java
index 705c8579ccd..29e025abc12 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java
@@ -103,4 +103,9 @@ public class TestSortedCopyOnWriteSet {
     }
     assertTrue(size > 0);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java b/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java
index d816c8802b6..3bd39afb129 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java
@@ -75,4 +75,9 @@ public class TestThreads {
         timeElapsed);
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
index 67cf3f2f2e5..2b4cac86cb7 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java
@@ -85,4 +85,9 @@ public class TestOfflineMetaRebuildBase extends OfflineMetaRebuildTestCore {
     assertEquals(16, tableRowCount(conf, table));
   }
 
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
index 2cc99634537..ebbeeada0d3 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java
@@ -88,4 +88,9 @@ public class TestOfflineMetaRebuildHole extends OfflineMetaRebuildTestCore {
         ERROR_CODE.NOT_IN_META_OR_DEPLOYED, ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
         ERROR_CODE.NOT_IN_META_OR_DEPLOYED, });
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
index 805f08f89ae..b17554819a9 100644
--- a/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
+++ b/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java
@@ -99,4 +99,9 @@ public class TestOfflineMetaRebuildOverlap extends OfflineMetaRebuildTestCore {
             ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
             ERROR_CODE.NOT_IN_META_OR_DEPLOYED, });
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
index 8e50117e057..764ac1984f1 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
@@ -139,4 +139,9 @@ public class TestHQuorumPeer {
     assertNotNull(p);
     assertEquals(2181, p.get("clientPort"));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java
index d34274ea204..43046809e25 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java
@@ -229,4 +229,9 @@ public class TestZKLeaderManager {
     ZooKeeperWatcher zk = new ZooKeeperWatcher(copy, name, abort);
     return zk;
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java
index 0704162b9a5..3de482bfc77 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTable.java
@@ -92,4 +92,9 @@ public class TestZKTable {
     assertTrue(zkt.isEnabledTable(name));
     assertFalse(zkt.isEnablingTable(name));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java
index 7a27e2333cb..8ab6011e613 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java
@@ -264,4 +264,9 @@ public class TestZooKeeperACL {
     assertEquals(acls.get(0).getId().getId(),"hbase");
     assertEquals(acls.get(0).getPerms(), ZooDefs.Perms.ALL);
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java
index d833cecb8f5..96073ce4615 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServerArg.java
@@ -42,4 +42,9 @@ public class TestZooKeeperMainServerArg {
     c.set("hbase.zookeeper.quorum", "example1.com,example2.com,example3.com");
     assertTrue(port, parser.parse(c).matches("example[1-3]\\.com:" + port));
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+
diff --git a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java
index 590ae94feb3..370738930f7 100644
--- a/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java
+++ b/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java
@@ -312,4 +312,9 @@ public class TestZooKeeperNodeTracker {
     @Override
     public void process(WatchedEvent event) {}
   }
+
+  @org.junit.Rule
+  public org.apache.hadoop.hbase.ResourceCheckerJUnitRule cu =
+    new org.apache.hadoop.hbase.ResourceCheckerJUnitRule();
 }
+