diff --git a/jetty-test-helper/src/main/java/org/eclipse/jetty/toolchain/test/StringAssert.java b/jetty-test-helper/src/main/java/org/eclipse/jetty/toolchain/test/StringAssert.java
index 66df25a..d890da0 100644
--- a/jetty-test-helper/src/main/java/org/eclipse/jetty/toolchain/test/StringAssert.java
+++ b/jetty-test-helper/src/main/java/org/eclipse/jetty/toolchain/test/StringAssert.java
@@ -20,8 +20,7 @@
 
 import java.util.List;
 
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
+import org.junit.Assert;
 
 public final class StringAssert
 {
@@ -52,7 +51,7 @@
             buf.append(msg).append(": Unable to find \"").append(needle).append("\" in \"");
             buf.append(haystack).append('\"');
             System.err.println(buf);
-            throw new AssertionFailedError(buf.toString());
+            throw new AssertionError(buf.toString());
         }
     }
 
@@ -81,7 +80,7 @@
             buf.append(msg).append(": Unable to find \"").append(needle).append("\" in \"");
             buf.append(haystack.substring(offset)).append('\"');
             System.err.println(buf);
-            throw new AssertionFailedError(buf.toString());
+            throw new AssertionError(buf.toString());
         }
     }
 
@@ -128,7 +127,7 @@
             buf.append(msg).append(": Should not have found \"").append(needle).append("\" at offset ");
             buf.append(idx).append(" in \"").append(haystack).append('\"');
             System.err.println(buf);
-            throw new AssertionFailedError(buf.toString());
+            throw new AssertionError(buf.toString());
         }
     }
 
@@ -158,7 +157,7 @@
             buf.append(msg).append(": Should not have found \"").append(needle).append("\" at offset ");
             buf.append(idx).append(" in \"").append(haystack.substring(offset)).append('\"');
             System.err.println(buf);
-            throw new AssertionFailedError(buf.toString());
+            throw new AssertionError(buf.toString());
         }
     }
 
@@ -186,7 +185,7 @@
             buf.append(haystack.substring(0,len));
             buf.append("\" does not start with expected \"").append(expected).append('\"');
             System.err.println(buf);
-            throw new AssertionFailedError(buf.toString());
+            throw new AssertionError(buf.toString());
         }
     }
 }
