diff --git a/jmock-junit4/src/test/java/org/jmock/test/acceptance/junit4/JUnit4TestRunnerTests.java b/jmock-junit4/src/test/java/org/jmock/test/acceptance/junit4/JUnit4TestRunnerTests.java
index b8e11e198..0272295e0 100644
--- a/jmock-junit4/src/test/java/org/jmock/test/acceptance/junit4/JUnit4TestRunnerTests.java
+++ b/jmock-junit4/src/test/java/org/jmock/test/acceptance/junit4/JUnit4TestRunnerTests.java
@@ -1,6 +1,7 @@
 package org.jmock.test.acceptance.junit4;
 
 import junit.framework.TestCase;
+import org.junit.runners.model.InvalidTestClassError;
 import testdata.jmock.acceptance.junit4.*;
 
 public class JUnit4TestRunnerTests extends TestCase {
@@ -46,9 +47,10 @@ public void testTheJUnit4TestRunnerReportsIfMoreThanOneMockeryIsFound() {
     
     public void testDetectsNonPublicBeforeMethodsCorrectly() {
         listener.runTestIn(JUnit4TestWithNonPublicBeforeMethod.class);
-        listener.assertTestFailedWith(Throwable.class);
+        listener.assertTestFailedWith(InvalidTestClassError.class);
         assertEquals("should have detected non-public before method",
-                "Method before() should be public",
+                "Invalid test class 'testdata.jmock.acceptance.junit4.JUnit4TestWithNonPublicBeforeMethod':\n" +
+                        "  1. Method before() should be public",
                        listener.failure.getMessage());
     }
     
diff --git a/pom.xml b/pom.xml
index 9112837df..4cf2d8a0e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
 
         <downloadSources>true</downloadSources>
         <hamcrest.version>2.2</hamcrest.version>
-        <junit.version>4.12</junit.version>
+        <junit.version>4.13.2</junit.version>
         <asm.version>8.0.1</asm.version>
         <objenesis.version>3.1</objenesis.version>
         <bsh.version>2.0b6</bsh.version>