diff --git a/releng/org.eclipse.gmf.tooling-parent/pom.xml b/releng/org.eclipse.gmf.tooling-parent/pom.xml
index c91ef18..ea869e6 100644
--- a/releng/org.eclipse.gmf.tooling-parent/pom.xml
+++ b/releng/org.eclipse.gmf.tooling-parent/pom.xml
@@ -53,9 +53,9 @@
 		<module>../../features/org.eclipse.gmf.europa-feature</module>
 		<module>../../features/org.eclipse.gmf.platform-feature</module>
 		<module>../../features/org.eclipse.gmf.sdk.experimental-feature</module>
-		<module>../../features/org.eclipse.gmf.sdk-feature</module>
+		<module>../../features/org.eclipse.gmf.sdk-feature</module-->
 		<module>../../features/org.eclipse.gmf.tooling-feature</module>
-		<module>../../features/org.eclipse.gmf.xpand-feature</module -->
+		<!-- module>../../features/org.eclipse.gmf.xpand-feature</module -->
 
 		<!-- examples -->
 		<!-- module>../../examples/org.eclipse.gmf.ecore.editor</module -->
@@ -104,11 +104,11 @@
 		<!-- tests, should be a separate build against newly built repo,
 			to test also created repo (whole distribution) -->
 		<!-- module>../../features/org.eclipse.gmf.tests.experimental-feature</module -->
-		<!-- module>../../features/org.eclipse.gmf.tests-feature</module>
-		< module>../../tests/org.eclipse.gmf.tests</module>
+		<!-- module>../../features/org.eclipse.gmf.tests-feature</module-->
+		<module>../../tests/org.eclipse.gmf.tests</module>
 		<module>../../tests/org.eclipse.gmf.tests.lite</module>
 		<module>../../tests/org.eclipse.gmf.tests.xpand</module>
-		<module>../../tests/org.eclipse.gmf.tests.xpand.migration</module-->
+		<module>../../tests/org.eclipse.gmf.tests.xpand.migration</module>
 		
 	</modules>
 
diff --git a/tests/org.eclipse.gmf.tests/pom.xml b/tests/org.eclipse.gmf.tests/pom.xml
index ee1e8e3..5f4e720 100644
--- a/tests/org.eclipse.gmf.tests/pom.xml
+++ b/tests/org.eclipse.gmf.tests/pom.xml
@@ -19,8 +19,10 @@
 				<groupId>org.sonatype.tycho</groupId>
 				<artifactId>maven-osgi-test-plugin</artifactId>
 				<configuration>
-					<testSuite>org.eclipse.gmf.tests</testSuite>
-					<testClass>org.eclipse.gmf.tests.AllTests</testClass>
+					<!-- testSuite>org.eclipse.gmf.tests</testSuite>
+					<testClass>org.eclipse.gmf.tests.AllTests</testClass-->
+					<useUIHarness>true</useUIHarness>
+        			<useUIThread>true</useUIThread>
 					<argLine>-Xmx512m</argLine>
 					<bundleStartLevel>
 						<bundle>