diff --git a/src/test/java/net/hostsharing/hsadminng/arch/ArchUnitTest.java b/src/test/java/net/hostsharing/hsadminng/arch/ArchUnitTest.java
index ac8ab474..ec715867 100644
--- a/src/test/java/net/hostsharing/hsadminng/arch/ArchUnitTest.java
+++ b/src/test/java/net/hostsharing/hsadminng/arch/ArchUnitTest.java
@@ -81,6 +81,14 @@ public class ArchUnitTest {
             org.springframework.transaction.annotation.Transactional.class.getName(),
             javax.transaction.Transactional.class.getName()));
 
+    @ArchTest
+    @SuppressWarnings("unused")
+    public static final ArchRule doNotUseOrgJUnitTestAnnotation = noMethods()
+            .should().beAnnotatedWith(org.junit.Test.class)
+            .as("Use @%s instead of @%s." .formatted(
+                    org.junit.jupiter.api.Test.class.getName(),
+                    org.junit.Test.class.getName()));
+
     @Test
     public void everythingShouldBeFreeOfCycles() {
         slices().matching("net.hostsharing.hsadminng.(*)..").should().beFreeOfCycles();
diff --git a/src/test/java/net/hostsharing/test/JpaAttempt.java b/src/test/java/net/hostsharing/test/JpaAttempt.java
index eafa8fc1..83c9fe6e 100644
--- a/src/test/java/net/hostsharing/test/JpaAttempt.java
+++ b/src/test/java/net/hostsharing/test/JpaAttempt.java
@@ -1,6 +1,5 @@
 package net.hostsharing.test;
 
-import junit.framework.AssertionFailedError;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.NestedExceptionUtils;
 import org.springframework.stereotype.Service;
@@ -115,7 +114,8 @@ public class JpaAttempt {
             if (expectedExceptionClass.isAssignableFrom(exception.getClass())) {
                 return (E) exception;
             }
-            throw new AssertionFailedError("expected " + expectedExceptionClass + " but got " + exception);
+            fail("");
+            throw new AssertionError("expected " + expectedExceptionClass + " but got " + exception);
         }
 
         public Throwable caughtExceptionsRootCause() {