diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
index cececae..2b2a169 100644
--- a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
+++ b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -440,10 +440,7 @@
         </predicate>
       </sourceLocator>
       <sourceLocator
-          rootFolder="${git.clone.location}/tests">
-        <excludedPath>org.eclipse.emf.parsley.tests.pde.utils.kepler</excludedPath>
-        <excludedPath>org.eclipse.emf.parsley.tests.pde.utils.indigo</excludedPath>
-      </sourceLocator>
+          rootFolder="${git.clone.location}/tests"/>
     </setupTask>
     <setupTask
         xsi:type="setup.targlets:TargletTask">
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
index 0628f0f..43c81bf 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@
  org.eclipse.jdt.core,
  org.eclipse.xtext.common.types.ui,
  org.eclipse.emf.parsley.dsl.additional.builder,
- org.eclipse.emf.parsley.tests.pde.utils,
  org.eclipse.emf.parsley.views,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslContentAssistTest.xtend b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslContentAssistTest.xtend
index 0f855ad..cad867a 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslContentAssistTest.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslContentAssistTest.xtend
@@ -16,13 +16,12 @@
 import org.eclipse.emf.parsley.EmfParsleyJavaGuiceModule
 import org.eclipse.emf.parsley.dsl.tests.util.ui.PluginProjectHelper
 import org.eclipse.emf.parsley.dsl.ui.internal.DslActivator
-import org.eclipse.emf.parsley.tests.pde.utils.PDETargetPlatformUtils
 import org.eclipse.emf.parsley.views.EmfParsleyViewsActivator
 import org.eclipse.jdt.core.IJavaProject
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
-import org.eclipse.xtext.ui.testing.ContentAssistProcessorTestBuilder
 import org.eclipse.xtext.ui.testing.AbstractContentAssistTest
+import org.eclipse.xtext.ui.testing.ContentAssistProcessorTestBuilder
 import org.junit.AfterClass
 import org.junit.BeforeClass
 import org.junit.Test
@@ -43,8 +42,6 @@
 	
 	@BeforeClass
 	def static void setUp() {
-		PDETargetPlatformUtils.setTargetPlatform();
-		
 		val injector = DslActivator.getInstance().getInjector
 			(DslActivator.ORG_ECLIPSE_EMF_PARSLEY_DSL_EMFPARSLEYDSL);
 		
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
index d638f47..d1e4b5b 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/src/org/eclipse/emf/parsley/dsl/ui/tests/EmfParsleyDslWorkbenchTest.xtend
@@ -16,15 +16,13 @@
 import org.eclipse.emf.parsley.dsl.generator.EmfParsleyDslOutputConfigurationProvider
 import org.eclipse.emf.parsley.dsl.tests.util.ui.PluginProjectHelper
 import org.eclipse.emf.parsley.dsl.tests.util.ui.TestableEmfParsleyDslNewProjectWizard
-import org.eclipse.emf.parsley.tests.pde.utils.PDETargetPlatformUtils
 import org.eclipse.jface.viewers.StructuredSelection
 import org.eclipse.jface.wizard.Wizard
 import org.eclipse.jface.wizard.WizardDialog
 import org.eclipse.ui.PlatformUI
-import org.eclipse.xtext.ui.testing.AbstractWorkbenchTest
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.XtextRunner
-import org.junit.BeforeClass
+import org.eclipse.xtext.ui.testing.AbstractWorkbenchTest
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -80,11 +78,6 @@
 //		projectHelper.clearJdtIndex
 //	}
 
-	@BeforeClass
-	def static void beforeClass() {
-		PDETargetPlatformUtils.setTargetPlatform();
-	}
-
 	@Test def void testEmfParsleyDslNewProjectWizard() {
 		createProjectWithNewProjectWizard
 		projectHelper.assertNoErrors
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.classpath b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.classpath
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.classpath
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.classpath
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.project b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.project
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.project
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.project
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.settings/org.eclipse.jdt.core.prefs b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/.settings/org.eclipse.jdt.core.prefs
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/about.html b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/about.html
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/about.html
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/about.html
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/build.properties b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/build.properties
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/build.properties
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/build.properties
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/pom.xml
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java b/old/org.eclipse.emf.parsley.tests.pde.utils.indigo/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.indigo/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
rename to old/org.eclipse.emf.parsley.tests.pde.utils.indigo/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.classpath b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.classpath
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.classpath
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.classpath
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.project b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.project
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.project
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.project
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.settings/org.eclipse.jdt.core.prefs b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/.settings/org.eclipse.jdt.core.prefs
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/about.html b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/about.html
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/about.html
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/about.html
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/build.properties b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/build.properties
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/build.properties
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/build.properties
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/pom.xml
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java b/old/org.eclipse.emf.parsley.tests.pde.utils.kepler/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.kepler/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
rename to old/org.eclipse.emf.parsley.tests.pde.utils.kepler/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.classpath b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/.classpath
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.classpath
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/.classpath
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.project b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/.project
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.project
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/.project
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.core.prefs b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.core.prefs
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.launching.prefs b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.launching.prefs
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/.settings/org.eclipse.jdt.launching.prefs
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/META-INF/MANIFEST.MF
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/about.html b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/about.html
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/about.html
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/about.html
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/build.properties b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/build.properties
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/build.properties
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/build.properties
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/pom.xml
diff --git a/tests/org.eclipse.emf.parsley.tests.pde.utils.luna/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java b/old/org.eclipse.emf.parsley.tests.pde.utils.luna/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
similarity index 100%
rename from tests/org.eclipse.emf.parsley.tests.pde.utils.luna/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
rename to old/org.eclipse.emf.parsley.tests.pde.utils.luna/src/org/eclipse/emf/parsley/tests/pde/utils/PDETargetPlatformUtils.java
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index c8c086d..df0770b 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -81,7 +81,11 @@
 		<os-jvm-flags />
 		<memoryArgs>-Xms256M -Xmx4G -XX:PermSize=256M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
 		<uiTestsArgs>${memoryArgs} ${os-jvm-flags} -Dorg.eclipse.swt.browser.DefaultType=mozilla</uiTestsArgs>
+		<!-- 
+		The following is not needed anymore
 		<pdeTestsArgs>-DbuildingWithTycho=true</pdeTestsArgs>
+		-->
+		<pdeTestsArgs></pdeTestsArgs>
 		<skipDragAndDropTests>true</skipDragAndDropTests>
 		<swtbotTestsArgs>${uiTestsArgs} -DskipDragAndDropTests=${skipDragAndDropTests} -Dorg.eclipse.swtbot.search.timeout=20000 -Dorg.eclipse.swt.internal.gtk.cairoGraphics=false</swtbotTestsArgs>
 
@@ -264,7 +268,6 @@
 
 				<module>../../releng/org.eclipse.emf.parsley.repository</module>
 
-				<module>../../tests/org.eclipse.emf.parsley.tests.pde.utils.luna</module>
 				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4</module>
 				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.parsleypart</module>
 				<module>../../examples/org.eclipse.emf.parsley.examples.eclipse4.product.feature</module>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
index 5499467..253e2ba 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.feature/feature.xml
@@ -68,13 +68,6 @@
          version="0.0.0"/>
 
    <plugin
-         id="org.eclipse.emf.parsley.tests.pde.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.eclipse.emf.parsley.tests.views"
          download-size="0"
          install-size="0"
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
index ce826d5..3d62c03 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@
  org.eclipse.emf.parsley.tests.models,
  org.objectweb.asm;bundle-version="5.0.1",
  org.eclipse.ui.editors;bundle-version="3.5.0",
- org.eclipse.emf.parsley.tests.pde.utils,
  org.eclipse.emf.parsley.examples.views,
  org.eclipse.emf.parsley.tests,
  org.eclipse.emf.parsley.examples.editors,
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
index 83cd77e..fdcabe2 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -106,7 +106,6 @@
 					<execution>
 						<id>PDEBasedTests</id>
 						<phase>integration-test</phase>
-						<!-- These tests required PDE and must pass -DbuildingWithTycho=true -->
 						<configuration>
 							<skip>${swtbot.tests.skip}</skip>
 							<useUIHarness>true</useUIHarness>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
index 945ef9c..ebf9ed3 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/src/org/eclipse/emf/parsley/tests/swtbot/EmfParsleySWTBotAbstractTests.java
@@ -11,7 +11,9 @@
 package org.eclipse.emf.parsley.tests.swtbot;
 
 import static org.eclipse.swtbot.swt.finder.waits.Conditions.shellCloses;
-import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.*;
+import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.cleanWorkspace;
+import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.createFile;
+import static org.eclipse.xtext.ui.testing.util.IResourcesSetupUtil.root;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -43,7 +45,6 @@
 import org.eclipse.emf.parsley.examples.library.Library;
 import org.eclipse.emf.parsley.examples.views.EmfParsleyExamplesViewsActivator;
 import org.eclipse.emf.parsley.junit4.ui.util.ImageTester;
-import org.eclipse.emf.parsley.tests.pde.utils.PDETargetPlatformUtils;
 import org.eclipse.emf.parsley.tests.swtbot.activator.EmfParsleySwtBotTestsActivator;
 import org.eclipse.emf.parsley.tests.swtbot.views.TestOnSelectionLibraryTreeViewWithResourceURI;
 import org.eclipse.emf.parsley.util.ActionBarsUtils;
@@ -364,8 +365,6 @@
 
 	@BeforeClass
 	public static void beforeClass() throws Exception {
-		PDETargetPlatformUtils.setTargetPlatform();
-		
 		// force loading of examples.views
 		EmfParsleyExamplesViewsActivator.getDefault();