1 files changed, 4 insertions, 8 deletions
diff --git a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java b/aspectj5rt/testsrc/Aspectj5rtModuleTests.java
index ff1e30a2f..f0f6a3064 100644
--- a/aspectj5rt/testsrc/Aspectj5rtModuleTests.java
+++ b/aspectj5rt/testsrc/Aspectj5rtModuleTests.java
@@ -11,22 +11,18 @@
  * ******************************************************************/
 
 // default package
+import org.aspectj.testing.util.TestUtil;
 
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.aspectj.internal.lang.reflect.AjTypeTests;
-import org.aspectj.internal.lang.reflect.AjTypeTestsWithAspects;
-
 public class Aspectj5rtModuleTests extends TestCase {
 
-    public static Test suite() { 
+    public static Test suite() {
         TestSuite suite = new TestSuite("Aspectj5rt module tests");
-		suite.addTestSuite(AjTypeTests.class);
-		suite.addTestSuite(AjTypeTestsWithAspects.class);
+        TestUtil.loadTestsReflectively(suite, "Aspectj5rt15ModuleTests", true);
         return suite;
     }
 
-
-}  
+}