diff --git a/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java b/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
index 03e8e615d..8e27ceee3 100644
--- a/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
+++ b/archunit/src/main/java/com/tngtech/archunit/library/GeneralCodingRules.java
@@ -488,8 +488,7 @@ private boolean allPossibleTestClassesHaveImplementationInRightPackage(List<Java
                 return possibleTestClasses.stream()
                         .allMatch(testClazz -> classesByPackageName.getOrDefault(testClazz.getPackageName(), emptyList())
                                 .stream()
-                                .filter(clazz -> !testClazz.getSimpleName().equals(clazz.getSimpleName()))
-                                .anyMatch(clazz -> testClazz.getSimpleName().startsWith(clazz.getSimpleName())));
+                                 .anyMatch(clazz -> testClazz.getSimpleName().equals(clazz.getSimpleName() + testClassSuffix)));
             }
         };
     }