diff --git a/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java b/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java
index 2f26ff1359..93aa32d46e 100644
--- a/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java
+++ b/src/main/java/org/mockito/internal/runners/DefaultInternalRunner.java
@@ -30,34 +30,29 @@ public DefaultInternalRunner(Class<?> testClass, final Supplier<MockitoTestListe
             public Object target;
             private MockitoTestListener mockitoTestListener;
 
-            protected Statement withBefores(FrameworkMethod method, Object target, Statement statement) {
+            protected Statement withBefores(FrameworkMethod method, final Object target, Statement statement) {
                 this.target = target;
-                // get new test listener and add it to the framework
-                mockitoTestListener = listenerSupplier.get();
-                Mockito.framework().addListener(mockitoTestListener);
-                // init annotated mocks before tests
-                MockitoAnnotations.initMocks(target);
-                return super.withBefores(method, target, statement);
+                final Statement base = super.withBefores(method, target, statement);
+                return new Statement() {
+                    @Override
+                    public void evaluate() throws Throwable {
+                        // get new test listener and add it to the framework
+                        mockitoTestListener = listenerSupplier.get();
+                        Mockito.framework().addListener(mockitoTestListener);
+                        // init annotated mocks before tests
+                        MockitoAnnotations.initMocks(target);
+                        base.evaluate();
+                    }
+                };
             }
 
             public void run(final RunNotifier notifier) {
                 RunListener listener = new RunListener() {
-                    private boolean started;
                     Throwable failure;
 
-                    @Override
-                    public void testStarted(Description description) throws Exception {
-                        started = true;
-                    }
-
                     @Override
                     public void testFailure(Failure failure) throws Exception {
                         this.failure = failure.getException();
-                        // If the test fails during the setup, `testFinished` is never invoked
-                        // Therefore, if we have not started, cleanup the testlistener
-                        if (!started && mockitoTestListener != null) {
-                            Mockito.framework().removeListener(mockitoTestListener);
-                        }
                     }
 
                     @Override
diff --git a/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java b/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java
index 845e6a4e5e..253dcf72ce 100644
--- a/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java
+++ b/src/test/java/org/mockito/internal/runners/DefaultInternalRunnerTest.java
@@ -45,10 +45,10 @@ public void does_not_fail_second_test_when_first_test_fail() throws Exception {
             .run(newNotifier(runListener));
 
         verify(runListener, times(1)).testFailure(any(Failure.class));
-        verify(runListener, never()).testFinished(any(Description.class));
-        verify(mockitoTestListener, never()).testFinished(any(TestFinishedEvent.class));
+        verify(runListener, times(1)).testFinished(any(Description.class));
+        verify(mockitoTestListener, only()).testFinished(any(TestFinishedEvent.class));
 
-        reset(runListener);
+        reset(runListener, mockitoTestListener);
 
         new DefaultInternalRunner(SuccessTest.class, supplier)
             .run(newNotifier(runListener));