diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/AbstractMockContextWrapper.java b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/AbstractMockContextWrapper.java
index 521e732..cde3fd8 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/AbstractMockContextWrapper.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/AbstractMockContextWrapper.java
@@ -131,7 +131,6 @@ public Path[] answer(InvocationOnMock invocation) throws Throwable {
           return DistributedCache.getLocalCacheFiles(configuration);
         }      
       });
-
       when(context.getNumReduceTasks()).thenAnswer(new Answer<Integer>() {
         @Override
         @SuppressWarnings("deprecation")
@@ -139,7 +138,6 @@ public Integer answer(InvocationOnMock invocation) throws Throwable {
           return configuration.getInt("mapred.reduce.tasks", 1);
         }
       });
-
     } catch (IOException e) {
       throw new RuntimeException(e);
     } catch (InterruptedException e) {
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapContextWrapper.java b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapContextWrapper.java
index 72a903e..40112fa 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapContextWrapper.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockMapContextWrapper.java
@@ -33,6 +33,7 @@
 import org.apache.hadoop.mrunit.internal.output.MockOutputCreator;
 import org.apache.hadoop.mrunit.mapreduce.MapDriver;
 import org.apache.hadoop.mrunit.types.Pair;
+import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -71,7 +72,7 @@ public MockMapContextWrapper(
   @Override
   @SuppressWarnings({ "unchecked" })
   protected Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context create() {
-    final Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context context = mock(org.apache.hadoop.mapreduce.Mapper.Context.class);
+    final Mapper<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context context = mock(org.apache.hadoop.mapreduce.Mapper.Context.class, Mockito.RETURNS_DEEP_STUBS);
 
     createCommon(context, driver, mockOutputCreator);
 
diff --git a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockReduceContextWrapper.java b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockReduceContextWrapper.java
index d753cff..bc0d282 100644
--- a/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockReduceContextWrapper.java
+++ b/src/main/java/org/apache/hadoop/mrunit/internal/mapreduce/MockReduceContextWrapper.java
@@ -32,6 +32,7 @@
 import org.apache.hadoop.mrunit.internal.output.MockOutputCreator;
 import org.apache.hadoop.mrunit.mapreduce.ReduceDriver;
 import org.apache.hadoop.mrunit.types.KeyValueReuseList;
+import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
@@ -80,7 +81,7 @@ public MockReduceContextWrapper(
   @SuppressWarnings({ "unchecked" })
   protected Reducer<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context create() {
 
-    final Reducer<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context context = mock(org.apache.hadoop.mapreduce.Reducer.Context.class);
+    final Reducer<KEYIN, VALUEIN, KEYOUT, VALUEOUT>.Context context = mock(org.apache.hadoop.mapreduce.Reducer.Context.class, Mockito.RETURNS_DEEP_STUBS);
 
     createCommon(context, driver, mockOutputCreator);
     try {