diff --git a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
index d3d1736a..375462a7 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.tests/pom.xml
@@ -13,25 +13,6 @@
 	<artifactId>org.eclipse.emf.parsley.dsl.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
-	<!--
-		-XstartOnFirstThread is required by the test
-		org.eclipse.emf.parsley.dsl.tests.EmfParsleyDslExecutionTest.testGeneratedContentProvider()
-		which must access the SWT thread
-	-->
-	<profiles>
-		<profile>
-			<id>macosx-jvm-flags</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
-		</profile>
-	</profiles>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -47,24 +28,9 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>default-test</id>
-						<phase>integration-test</phase>
-						<configuration>
-							<skip>${dsl.tests.skip}</skip>
-							<useUIHarness>false</useUIHarness>
-							<useUIThread>false</useUIThread>
-							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-								for jacoco agent -->
-							<argLine>${tycho.testArgLine} ${uiTestsArgs} ${memoryArgs} ${moduleProperties}</argLine>
-						</configuration>
-						<goals>
-							<goal>test</goal>
-						</goals>
-					</execution>
-				</executions>
+				<configuration>
+					<skip>${dsl.tests.skip}</skip>
+				</configuration>
 			</plugin>
 
 		</plugins>
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
index f5e86004..f3e15bf7 100644
--- a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
+++ b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/pom.xml
@@ -20,9 +20,6 @@
 					<family>mac</family>
 				</os>
 			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -63,35 +60,14 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>default-test</id>
-						<phase>integration-test</phase>
-						<configuration>
-							<skip>${dsl.tests.skip}</skip>
-							<useUIHarness>true</useUIHarness>
-							<useUIThread>true</useUIThread>
-							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-								for jacoco agent -->
-							<argLine>${tycho.testArgLine} ${uiTestsArgs} ${pdeTestsArgs} ${moduleProperties}</argLine>
-							<includes>
-								<include>**/org/eclipse/emf/parsley/dsl/ui/tests/*Test.java</include>
-							</includes>
-							<!-- TODO remove with tycho 1.3 -->
-							<bundleStartLevel>
-								<bundle>
-									<id>org.apache.felix.scr</id>
-									<level>1</level>
-									<autoStart>true</autoStart>
-								</bundle>
-							</bundleStartLevel>
-						</configuration>
-						<goals>
-							<goal>test</goal>
-						</goals>
-					</execution>
-				</executions>
+				<configuration>
+					<skip>${dsl.tests.skip}</skip>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+					<includes>
+						<include>**/org/eclipse/emf/parsley/dsl/ui/tests/*Test.java</include>
+					</includes>
+				</configuration>
 			</plugin>
 
 			<plugin>
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
index 6297ed6c..c6f3d49f 100644
--- a/releng/org.eclipse.emf.parsley.parent/pom.xml
+++ b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -743,6 +743,22 @@
 					</configuration>
 				</plugin>
 
+				<!-- to skip running (and compiling) tests use commandline flag: -Dmaven.test.skip
+					To skip tests, but still compile them, use: -DskipTests
+					To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail
+					at end) -->
+				<plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-surefire-plugin</artifactId>
+					<version>${tycho-version}</version>
+					<configuration>
+						<!-- THE FOLLOWING LINE MUST NOT BE BROKEN BY AUTOFORMATTING -->
+						<argLine>${previewProperties} ${platformSystemProperties} ${systemProperties} ${moduleProperties} ${additionalTestArguments}</argLine>
+						<failIfNoTests>false</failIfNoTests>
+						<useUIHarness>false</useUIHarness>
+					</configuration>
+				</plugin>
+
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
index 8429cf15..6ec0c693 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.cdo/pom.xml
@@ -13,20 +13,6 @@
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.cdo</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
 
-	<profiles>
-		<profile>
-			<id>macosx-jvm-flags</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
-		</profile>
-	</profiles>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -37,28 +23,16 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<configuration>
 					<skip>${swtbot.cdo.tests.skip}</skip>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>false</useUIThread>
-					<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-						for jacoco agent -->
-					<argLine>${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}</argLine>
 					<includes>
 						<include>**/*Test*.java</include>
 					</includes>
-					<!-- TODO remove with tycho 1.3 -->
-					<bundleStartLevel>
-						<bundle>
-							<id>org.apache.felix.scr</id>
-							<level>1</level>
-							<autoStart>true</autoStart>
-						</bundle>
-					</bundleStartLevel>
 				</configuration>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
index 9e8c233b..b641911a 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.e4/pom.xml
@@ -12,20 +12,6 @@
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.e4</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	
-	<profiles>
-		<profile>
-			<id>macosx-jvm-flags</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
-		</profile>
-	</profiles>
 
 	<build>
 		<plugins>
@@ -37,15 +23,11 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<configuration>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>false</useUIThread>
 					<product>org.eclipse.emf.parsley.examples.eclipse4.product</product>
 					<application>org.eclipse.e4.ui.workbench.swt.E4Application</application>
-					<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-						for jacoco agent -->
-					<argLine>${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}</argLine>
 					<environmentVariables>
 						<!-- Ubuntu overlay scrollbars cause different crashes in GTK2 so disable them -->
 						<LIBOVERLAY_SCROLLBAR>0</LIBOVERLAY_SCROLLBAR>
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
index e709dce7..3cfad54a 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot.examples/pom.xml
@@ -12,20 +12,6 @@
 
 	<artifactId>org.eclipse.emf.parsley.tests.swtbot.examples</artifactId>
 	<packaging>eclipse-test-plugin</packaging>
-	
-	<profiles>
-		<profile>
-			<id>macosx-jvm-flags</id>
-			<activation>
-				<os>
-					<family>mac</family>
-				</os>
-			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
-		</profile>
-	</profiles>
 
 	<build>
 		<plugins>
@@ -37,24 +23,12 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<configuration>
 					<skip>${swtbot.tests.skip}</skip>
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>false</useUIThread>
 					<product>org.eclipse.emf.parsley.examples.mail.rcp.product</product>
 					<application>org.eclipse.emf.parsley.examples.mail.rcp.application</application>
-					<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-						for jacoco agent -->
-					<argLine>${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}</argLine>
-					<!-- TODO remove with tycho 1.3 -->
-					<bundleStartLevel>
-						<bundle>
-							<id>org.apache.felix.scr</id>
-							<level>1</level>
-							<autoStart>true</autoStart>
-						</bundle>
-					</bundleStartLevel>
 				</configuration>
 			</plugin>
 
diff --git a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
index 458416be..a6e1190b 100644
--- a/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests.swtbot/pom.xml
@@ -21,9 +21,6 @@
 					<family>mac</family>
 				</os>
 			</activation>
-			<properties>
-				<os-jvm-flags>-XstartOnFirstThread</os-jvm-flags>
-			</properties>
 			<build>
 				<plugins>
 					<plugin>
@@ -59,7 +56,6 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<executions>
 					<execution>
 						<id>default-test</id>
@@ -68,10 +64,6 @@
 							<skip>${swtbot.tests.skip}</skip>
 							<useUIHarness>true</useUIHarness>
 							<useUIThread>false</useUIThread>
-							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-								for jacoco agent -->
-							<argLine>${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}</argLine>
-							<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java</exclude>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java</exclude>
@@ -91,7 +83,7 @@
 						</goals>
 					</execution>
 					<execution>
-						<!-- In Hudson DragAndDrop tests seem to be "disturbed" by other tests,
+						<!-- In CI DragAndDrop tests seem to be "disturbed" by other tests,
 							so we run them in an isolated run. -->
 						<id>draganddrop-test</id>
 						<phase>integration-test</phase>
@@ -99,10 +91,6 @@
 							<skip>${swtbot.tests.skip}</skip>
 							<useUIHarness>true</useUIHarness>
 							<useUIThread>false</useUIThread>
-							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-								for jacoco agent -->
-							<argLine>${tycho.testArgLine} ${swtbotTestsArgs} ${moduleProperties}</argLine>
-							<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*WizardsTest*.java</exclude>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*DslEditorTest*.java</exclude>
@@ -125,15 +113,8 @@
 						<phase>integration-test</phase>
 						<configuration>
 							<skip>${swtbot.tests.skip}</skip>
-							<!-- temporary skip these flaky tests
-							<skip>${swtbot.tests.skip}</skip>
-							 -->
 							<useUIHarness>true</useUIHarness>
 							<useUIThread>false</useUIThread>
-							<!-- tycho.testArgLine repeated to re-use the configuration for argLine 
-								for jacoco agent -->
-							<argLine>${tycho.testArgLine} ${pdeTestsArgs} ${swtbotTestsArgs} ${moduleProperties}</argLine>
-							<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
 							<excludes>
 								<exclude>**/org/eclipse/emf/parsley/tests/swtbot/*AbstractTest*.java</exclude>
 							</excludes>
@@ -151,7 +132,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
diff --git a/tests/org.eclipse.emf.parsley.tests/pom.xml b/tests/org.eclipse.emf.parsley.tests/pom.xml
index 11a60546..b646b017 100644
--- a/tests/org.eclipse.emf.parsley.tests/pom.xml
+++ b/tests/org.eclipse.emf.parsley.tests/pom.xml
@@ -65,7 +65,6 @@
 			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-surefire-plugin</artifactId>
-				<version>${tycho-version}</version>
 				<executions>
 					<execution>
 						<id>default-test</id>