diff --git a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java
index 6a961068e..13e931413 100644
--- a/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java
+++ b/org.eclipse.wb.tests/src/org/eclipse/wb/tests/designer/core/AbstractJavaProjectTest.java
@@ -266,13 +266,8 @@ public final ICompilationUnit createModelCompilationUnit(String packageName,
 			String unitName,
 			String code) throws Exception {
 		IPackageFragment pkg = m_testProject.getPackage(packageName);
-		// discard cached unit
-		ICompilationUnit compilationUnit = pkg.getCompilationUnit(unitName);
-		while (compilationUnit.isWorkingCopy()) {
-			compilationUnit.discardWorkingCopy();
-		}
 		// create unit
-		compilationUnit = m_testProject.createUnit(pkg, unitName, code);
+		ICompilationUnit compilationUnit = m_testProject.createUnit(pkg, unitName, code);
 		IFile resource = (IFile) compilationUnit.getUnderlyingResource();
 		m_createdResources.add(resource);
 		// OK, return unit
@@ -602,10 +597,6 @@ public static void forceDeleteResource(IResource resource) {
 	 */
 	public static void forceDeleteCompilationUnit(ICompilationUnit cu) {
 		while (cu.exists()) {
-			try {
-				cu.discardWorkingCopy();
-			} catch (Throwable e) {
-			}
 			try {
 				cu.getResource().refreshLocal(IResource.DEPTH_INFINITE, null);
 			} catch (Throwable e) {