diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMapFileOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMapFileOutputFormat.java
index 7e315ae7a3..b82cd70d3f 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMapFileOutputFormat.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapred/TestMapFileOutputFormat.java
@@ -24,6 +24,7 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.MapFile.Reader;
+import org.junit.After;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -40,9 +41,10 @@ public void testPartitionerShouldNotBeCalledWhenOneReducerIsPresent()
     assertTrue(!MyPartitioner.isGetPartitionCalled());
   }
 
-  protected void tearDown() throws Exception {
+  @After
+  public void tearDown() throws Exception {
     MyPartitioner.setGetPartitionCalled(false);
-  };
+  }
   private static class MyPartitioner
       implements
         Partitioner<WritableComparable, Writable> {
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMapFileOutputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMapFileOutputFormat.java
index 82758f1557..47220be202 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMapFileOutputFormat.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/lib/output/TestMapFileOutputFormat.java
@@ -25,6 +25,7 @@
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.io.MapFile.Reader;
 import org.apache.hadoop.mapreduce.Partitioner;
+import org.junit.After;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -41,6 +42,7 @@ public void testPartitionerShouldNotBeCalledWhenOneReducerIsPresent()
     assertTrue(!MyPartitioner.isGetPartitionCalled());
   }
 
+  @After
   public void tearDown() throws Exception {
     MyPartitioner.setGetPartitionCalled(false);
   }