36 files changed, 63 insertions, 131 deletions
diff --git a/ajde.core/.classpath b/ajde.core/.classpath.2
index 0a49960ab..0a49960ab 100644
--- a/ajde.core/.classpath
+++ b/ajde.core/.classpath.2
diff --git a/ajde.core/.isJava8 b/ajde.core/.isJava8
deleted file mode 100644
index 136d06384..000000000
--- a/ajde.core/.isJava8
+++ /dev/null
@@ -1 +0,0 @@
-  
-\ No newline at end of file
diff --git a/ajde.core/.project b/ajde.core/.project
deleted file mode 100644
index f3d567292..000000000
--- a/ajde.core/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ajde.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/ajde.core/build.xml b/ajde.core/build.xml
deleted file mode 100644
index f51fa5690..000000000
--- a/ajde.core/build.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<!-- see ../build/*.html for explanation -->
-<project name="ajde.core" default="test" basedir=".">
-    <import file="${basedir}/../build/build.xml"/>  
-</project>
-
diff --git a/ajde.core/pom.xml b/ajde.core/pom.xml
new file mode 100644
index 000000000..d6315cf5b
--- /dev/null
+++ b/ajde.core/pom.xml
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>ajde.core</artifactId>
+  <packaging>jar</packaging>
+  <name>ajde.core</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>asm</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.aspectj.ajdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java b/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java
index d6231a05f..d6231a05f 100644
--- a/ajde.core/src/org/aspectj/ajde/core/AjCompiler.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/AjCompiler.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/IBuildMessageHandler.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java
index 064e37c92..064e37c92 100644
--- a/ajde.core/src/org/aspectj/ajde/core/IBuildMessageHandler.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildMessageHandler.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/IBuildProgressMonitor.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java
index 120dda25a..120dda25a 100644
--- a/ajde.core/src/org/aspectj/ajde/core/IBuildProgressMonitor.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IBuildProgressMonitor.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java b/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java
index 8f8351759..8f8351759 100644
--- a/ajde.core/src/org/aspectj/ajde/core/ICompilerConfiguration.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/ICompilerConfiguration.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java
index 41b921bbf..41b921bbf 100644
--- a/ajde.core/src/org/aspectj/ajde/core/IOutputLocationManager.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/IOutputLocationManager.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
index 5de225339..5de225339 100644
--- a/ajde.core/src/org/aspectj/ajde/core/JavaOptions.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/JavaOptions.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
index 08d3ee377..08d3ee377 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildManager.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
index 9cc5ecfc9..9cc5ecfc9 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreBuildNotifierAdapter.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
index 8cb53e047..8cb53e047 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/AjdeCoreMessageHandlerAdapter.java
diff --git a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
index 7fe6a9cb1..7fe6a9cb1 100644
--- a/ajde.core/src/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
+++ b/ajde.core/src/main/java/org/aspectj/ajde/core/internal/OutputLocationAdapter.java
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
index e24e85217..052d547c6 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTestCase.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/AjdeCoreTestCase.java
@@ -19,13 +19,13 @@ import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
 import org.aspectj.ajde.core.TestMessageHandler.TestMessage;
-import org.aspectj.tools.ajc.Ajc;
+import org.aspectj.testing.util.TestUtil;
 
 /**
  * Testcase class to be used by all ajde.core tests. Provides helper methods to set up the environment in a sandbox as well as to
  * drive a build.
  */
-public class AjdeCoreTestCase extends TestCase {
+public abstract class AjdeCoreTestCase extends TestCase {
 
 	public final static String testdataSrcDir = "../ajde.core/testdata";
 	protected static File sandboxDir;
@@ -36,7 +36,7 @@ public class AjdeCoreTestCase extends TestCase {
 	protected void setUp() throws Exception {
 		super.setUp();
 		// Create a sandbox in which to work
-		sandboxDir = Ajc.createEmptySandbox();
+		sandboxDir = TestUtil.createEmptySandbox();
 		// AMC - added this next line as a temporary workaround for
 		// listener leakage in AsmManager induced by the Ajde test suite.
 		// AsmManager.getDefault().removeAllListeners();
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/TestBuildProgressMonitor.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
index 2a293b626..2a293b626 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/TestBuildProgressMonitor.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestBuildProgressMonitor.java
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/TestCompilerConfiguration.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
index 013786611..57d1ce73a 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/TestCompilerConfiguration.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestCompilerConfiguration.java
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.aspectj.tools.ajc.AjcTests;
+import org.aspectj.testing.util.TestUtil;
 import org.aspectj.util.FileUtil;
 import org.aspectj.util.LangUtil;
 
@@ -66,7 +66,7 @@ public class TestCompilerConfiguration implements ICompilerConfiguration {
         } else {
         		classpath.append(File.pathSeparator).append(System.getProperty("sun.boot.class.path"));
         }
-		classpath.append(File.pathSeparator).append(AjcTests.aspectjrtClasspath());
+		classpath.append(File.pathSeparator).append(TestUtil.aspectjrtClasspath());
 		return classpath.toString();
 	}
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/TestMessageHandler.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
index 6cc8b8a8d..6cc8b8a8d 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/TestMessageHandler.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestMessageHandler.java
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/TestOutputLocationManager.java b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
index 4249d2d56..4249d2d56 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/TestOutputLocationManager.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/TestOutputLocationManager.java
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
index 902ab7ee6..eb7d67b9c 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/AjConfigTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/AjConfigTest.java
@@ -30,7 +30,7 @@ import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
 /**
  * Tests that the AjBuildConfig is populated correctly from the ICompilerConfiguration
  */
-public class AjConfigTests extends AjdeCoreTestCase {
+public class AjConfigTest extends AjdeCoreTestCase {
 
 	private TestCompilerConfiguration compilerConfig;
 	private AjdeCoreBuildManager ajdeBuildManager;
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/BuildCancellingTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java
index 2e0bffaa0..75c37df84 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/BuildCancellingTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/BuildCancellingTest.java
@@ -43,7 +43,7 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
  * phase then the disk will contain anything finished with by the cancellation
  * point.
  */
-public class BuildCancellingTests extends AjdeCoreTestCase {
+public class BuildCancellingTest extends AjdeCoreTestCase {
 
 	private final boolean debugTests = false;
 	private TestBuildProgressMonitor programmableBPM;
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/CompilerMessagesTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java
index 7ff298ae5..0284b3d10 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/CompilerMessagesTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/CompilerMessagesTest.java
@@ -22,7 +22,7 @@ import org.aspectj.ajde.core.TestMessageHandler;
 import org.aspectj.ajde.core.TestMessageHandler.TestMessage;
 import org.aspectj.bridge.IMessage;
 
-public class CompilerMessagesTests extends AjdeCoreTestCase {
+public class CompilerMessagesTest extends AjdeCoreTestCase {
 
 	private TestMessageHandler handler;
 	private TestCompilerConfiguration compilerConfig;
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/DuplicateManifestTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
index 24286d6bd..b7c2a9251 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/DuplicateManifestTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/DuplicateManifestTest.java
@@ -22,7 +22,7 @@ import org.aspectj.ajde.core.AjdeCoreTestCase;
 import org.aspectj.ajde.core.TestCompilerConfiguration;
 import org.aspectj.ajde.core.TestMessageHandler;
 
-public class DuplicateManifestTests extends AjdeCoreTestCase {
+public class DuplicateManifestTest extends AjdeCoreTestCase {
 
 	public static final String injarName = "injar.jar";
 	public static final String aspectjarName = "aspectjar.jar";
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/InpathTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
index af3313334..af1040e5f 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/InpathTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/InpathTest.java
@@ -28,7 +28,7 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
 import org.aspectj.ajde.core.TestMessageHandler;
 import org.aspectj.util.FileUtil;
 
-public class InpathTests extends AjdeCoreTestCase {
+public class InpathTest extends AjdeCoreTestCase {
 
 	public static final FileFilter aspectjResourceFileFilter = new FileFilter() {
 		@Override
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/JarManifestTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java
index ec3a6c32c..242c3e3f3 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/JarManifestTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/JarManifestTest.java
@@ -21,7 +21,7 @@ import org.aspectj.ajde.core.AjdeCoreTestCase;
 import org.aspectj.ajde.core.TestCompilerConfiguration;
 import org.aspectj.ajde.core.TestMessageHandler;
 
-public class JarManifestTests extends AjdeCoreTestCase {
+public class JarManifestTest extends AjdeCoreTestCase {
 
 	public static final String outjarName = "/bin/output.jar";
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/OutxmlTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
index f21ba941e..7cf08b1c7 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/OutxmlTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/OutxmlTest.java
@@ -25,7 +25,7 @@ import org.aspectj.ajde.core.TestMessageHandler;
 import org.aspectj.ajde.core.TestMessageHandler.TestMessage;
 import org.aspectj.bridge.Constants;
 
-public class OutxmlTests extends AjdeCoreTestCase {
+public class OutxmlTest extends AjdeCoreTestCase {
 
 	public static final String PROJECT_DIR = "OutxmlTest";
 	public static final String BIN_DIR = "bin";
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ResourceCopyTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
index 1dbdd6afc..c75da5b04 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ResourceCopyTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ResourceCopyTest.java
@@ -27,7 +27,7 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
 import org.aspectj.ajde.core.TestMessageHandler;
 import org.aspectj.util.FileUtil;
 
-public class ResourceCopyTests extends AjdeCoreTestCase {
+public class ResourceCopyTest extends AjdeCoreTestCase {
 
 	public static final String PROJECT_DIR = "bug-36071a";
 	public static final String srcDir = PROJECT_DIR + "/src";
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ReweavableTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
index 4226b0924..24723b253 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ReweavableTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ReweavableTest.java
@@ -22,7 +22,7 @@ import org.aspectj.ajde.core.TestCompilerConfiguration;
 import org.aspectj.ajde.core.TestMessageHandler;
 import org.aspectj.bridge.IMessage;
 
-public class ReweavableTests extends AjdeCoreTestCase {
+public class ReweavableTest extends AjdeCoreTestCase {
 
 	private static final boolean debugTests = false;
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ShowWeaveMessagesTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
index 4deba3674..c13462620 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/ShowWeaveMessagesTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/ShowWeaveMessagesTest.java
@@ -55,7 +55,7 @@ import org.aspectj.util.LangUtil;
  * 
  * TODO - Other forms of declare? Do they need messages? e.g. declare precedence *
  */
-public class ShowWeaveMessagesTests extends AjdeCoreTestCase {
+public class ShowWeaveMessagesTest extends AjdeCoreTestCase {
 
 	private static boolean regenerate;
 	private static boolean debugTests = false;
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/AsmDeclarationsTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java
index d64704d54..7a2ec9fc5 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/AsmDeclarationsTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmDeclarationsTest.java
@@ -17,7 +17,7 @@ import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 
-public class AsmDeclarationsTests extends AjdeCoreTestCase {
+public class AsmDeclarationsTest extends AjdeCoreTestCase {
 
 	private AsmManager manager = null;
 	private IHierarchy model = null;
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/AsmRelationshipsTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java
index c3486a524..20b6e346e 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/AsmRelationshipsTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/AsmRelationshipsTest.java
@@ -20,7 +20,7 @@ import org.aspectj.asm.AsmManager;
 import org.aspectj.asm.IProgramElement;
 import org.aspectj.asm.IRelationship;
 
-public class AsmRelationshipsTests extends AjdeCoreTestCase {
+public class AsmRelationshipsTest extends AjdeCoreTestCase {
 
 	private AsmManager manager = null;
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java
index ed5c87c0f..6430cead1 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/SavedModelConsistencyTest.java
@@ -25,7 +25,7 @@ import org.aspectj.asm.HierarchyWalker;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 
-public class SavedModelConsistencyTests extends AjdeCoreTestCase {
+public class SavedModelConsistencyTest extends AjdeCoreTestCase {
 
 	private final String[] files = new String[] { "ModelCoverage.java", "pkg" + File.separator + "InPackage.java" };
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/StructureModelTests.java b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java
index e6f190437..6755ca57e 100644
--- a/ajde.core/testsrc/org/aspectj/ajde/core/tests/model/StructureModelTests.java
+++ b/ajde.core/src/test/java/org/aspectj/ajde/core/tests/model/StructureModelTest.java
@@ -24,7 +24,7 @@ import org.aspectj.asm.HierarchyWalker;
 import org.aspectj.asm.IHierarchy;
 import org.aspectj.asm.IProgramElement;
 
-public class StructureModelTests extends AjdeCoreTestCase {
+public class StructureModelTest extends AjdeCoreTestCase {
 
 	private AsmManager manager = null;
 
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreModuleTests.java b/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreModuleTests.java
deleted file mode 100644
index 0015e79ec..000000000
--- a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreModuleTests.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
- * 				 Helen Hawkins   - initial version
- *******************************************************************/
-package org.aspectj.ajde.core;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AjdeCoreModuleTests extends TestCase {
-
-	public static TestSuite suite() {
-		TestSuite suite = new TestSuite(AjdeCoreModuleTests.class.getName());
-		suite.addTest(org.aspectj.ajde.core.AjdeCoreTests.suite());
-		return suite;
-	}
-
-	public AjdeCoreModuleTests(String name) {
-		super(name);
-	}
-
-}
diff --git a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTests.java b/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTests.java
deleted file mode 100644
index 7e45b4757..000000000
--- a/ajde.core/testsrc/org/aspectj/ajde/core/AjdeCoreTests.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/********************************************************************
- * Copyright (c) 2007 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
- * 				 Helen Hawkins   - initial version
- *******************************************************************/
-package org.aspectj.ajde.core;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.aspectj.ajde.core.tests.AjConfigTests;
-import org.aspectj.ajde.core.tests.BuildCancellingTests;
-import org.aspectj.ajde.core.tests.CompilerMessagesTests;
-import org.aspectj.ajde.core.tests.DuplicateManifestTests;
-import org.aspectj.ajde.core.tests.InpathTests;
-import org.aspectj.ajde.core.tests.JarManifestTests;
-import org.aspectj.ajde.core.tests.OutxmlTests;
-import org.aspectj.ajde.core.tests.ResourceCopyTests;
-import org.aspectj.ajde.core.tests.ReweavableTests;
-import org.aspectj.ajde.core.tests.ShowWeaveMessagesTests;
-import org.aspectj.ajde.core.tests.model.AsmDeclarationsTests;
-import org.aspectj.ajde.core.tests.model.AsmRelationshipsTests;
-import org.aspectj.ajde.core.tests.model.SavedModelConsistencyTests;
-import org.aspectj.ajde.core.tests.model.StructureModelTests;
-
-public class AjdeCoreTests extends TestCase {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(AjdeCoreTests.class.getName());
-		// $JUnit-BEGIN$
-		suite.addTestSuite(ShowWeaveMessagesTests.class);
-		suite.addTestSuite(DuplicateManifestTests.class);
-		suite.addTestSuite(StructureModelTests.class);
-		suite.addTestSuite(CompilerMessagesTests.class);
-		suite.addTestSuite(AsmDeclarationsTests.class);
-		suite.addTestSuite(AsmRelationshipsTests.class);
-		suite.addTestSuite(InpathTests.class);
-		suite.addTestSuite(ReweavableTests.class);
-		suite.addTestSuite(ResourceCopyTests.class);
-		suite.addTestSuite(SavedModelConsistencyTests. class);
-		suite.addTestSuite(BuildCancellingTests.class);
-		suite.addTestSuite(JarManifestTests.class);
-		suite.addTestSuite(OutxmlTests.class);
-		suite.addTestSuite(AjConfigTests.class);
-
-		// $JUnit-END$
-		return suite;
-	}
-
-	public AjdeCoreTests(String name) {
-		super(name);
-	}
-
-}