diff --git a/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java b/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
index f313d8ddfac..30beb8ab343 100644
--- a/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
+++ b/hbase-hadoop1-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
@@ -48,7 +48,7 @@ public class TestMetricsRegionSourceImpl {
     CompatibilitySingletonFactory.getInstance(MetricsRegionSource.class);
   }
 
-  class RegionWrapperStub implements MetricsRegionWrapper {
+  static class RegionWrapperStub implements MetricsRegionWrapper {
 
     private String regionName;
 
diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
index f313d8ddfac..30beb8ab343 100644
--- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
+++ b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
@@ -48,7 +48,7 @@ public class TestMetricsRegionSourceImpl {
     CompatibilitySingletonFactory.getInstance(MetricsRegionSource.class);
   }
 
-  class RegionWrapperStub implements MetricsRegionWrapper {
+  static class RegionWrapperStub implements MetricsRegionWrapper {
 
     private String regionName;
 
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
index 5646d12df5f..5d2f6ea6eb0 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
@@ -328,7 +328,7 @@ public class IntegrationTestMTTR {
    *
    * Stores times and trace id.
    */
-  private class TimingResult {
+  private static class TimingResult {
     DescriptiveStatistics stats = new DescriptiveStatistics();
     ArrayList<Long> traces = new ArrayList<Long>(10);
 
@@ -366,7 +366,7 @@ public class IntegrationTestMTTR {
   /**
    * Base class for actions that need to record the time needed to recover from a failure.
    */
-  public abstract class TimingCallable implements Callable<TimingResult> {
+  static abstract class TimingCallable implements Callable<TimingResult> {
     protected final Future<?> future;
 
     public TimingCallable(Future<?> f) {
@@ -456,7 +456,7 @@ public class IntegrationTestMTTR {
    * Callable that will keep putting small amounts of data into a table
    * until  the future supplied returns.  It keeps track of the max time.
    */
-  public class PutCallable extends TimingCallable {
+  static class PutCallable extends TimingCallable {
 
     private final HTable table;
 
@@ -484,7 +484,7 @@ public class IntegrationTestMTTR {
    * Callable that will keep scanning for small amounts of data until the
    * supplied future returns.  Returns the max time taken to scan.
    */
-  public class ScanCallable extends TimingCallable {
+  static class ScanCallable extends TimingCallable {
     private final HTable table;
 
     public ScanCallable(Future<?> f) throws IOException {
@@ -520,7 +520,7 @@ public class IntegrationTestMTTR {
   /**
    * Callable that will keep going to the master for cluster status.  Returns the max time taken.
    */
-  public class AdminCallable extends TimingCallable {
+  static class AdminCallable extends TimingCallable {
 
     public AdminCallable(Future<?> f) throws IOException {
       super(f);
@@ -547,7 +547,7 @@ public class IntegrationTestMTTR {
   }
 
 
-  public class ActionCallable implements Callable<Boolean> {
+  static class ActionCallable implements Callable<Boolean> {
     private final Action action;
 
     public ActionCallable(Action action) {
@@ -565,7 +565,7 @@ public class IntegrationTestMTTR {
    * Callable used to make sure the cluster has some load on it.
    * This callable uses LoadTest tool to
    */
-  public class LoadCallable implements Callable<Boolean> {
+  public static class LoadCallable implements Callable<Boolean> {
 
     private final Future<?> future;
 
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
index 51eb3da2e3e..61928944636 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java
@@ -185,7 +185,7 @@ public class TableSnapshotInputFormat extends InputFormat<ImmutableBytesWritable
   }
 
   @VisibleForTesting
-  class TableSnapshotRegionRecordReader extends RecordReader<ImmutableBytesWritable, Result> {
+  static class TableSnapshotRegionRecordReader extends RecordReader<ImmutableBytesWritable, Result> {
     private TableSnapshotRegionSplit split;
     private Scan scan;
     private Result result = null;
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java
index 3f0124a5b49..faf9138bdb4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ServerNonceManager.java
@@ -112,7 +112,7 @@ public class ServerNonceManager {
    * This implementation is not smart and just treats nonce group and nonce as random bits.
    */
   // TODO: we could use pure byte arrays, but then we wouldn't be able to use hash map.
-  private class NonceKey {
+  private static class NonceKey {
     private long group;
     private long nonce;