diff --git a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java index d3b0558eef5..02147a3992e 100644 --- a/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java +++ b/spring-test/src/main/java/org/springframework/test/context/bean/override/mockito/MockitoResetTestExecutionListener.java @@ -99,7 +99,7 @@ public class MockitoResetTestExecutionListener extends AbstractTestExecutionList @Override public void afterTestMethod(TestContext testContext) { - if (isEnabled()) { + if (isEnabled() && testContext.hasApplicationContext()) { resetMocks(testContext.getApplicationContext(), MockReset.AFTER); } }