diff --git a/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml b/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
index f77cba8..3482254 100644
--- a/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
+++ b/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml
@@ -16,8 +16,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.ide.eclipse.archives.core</bundle>
diff --git a/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml b/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
index eab3855..dc35658 100644
--- a/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
+++ b/as/tests/org.jboss.ide.eclipse.as.management.as7.tests/pom.xml
@@ -13,8 +13,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
 					 		<include>**/*Test.class</include>
diff --git a/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml b/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
index 6f5b351..20485cc 100644
--- a/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
+++ b/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.ide.eclipse.as.ui.test</bundle>
diff --git a/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml b/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
index 24446dd..ad8e41a 100644
--- a/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
+++ b/build/aggregate/bottests-site/tests/org.jboss.tools.drools.ui.bot.test/pom.xml
@@ -13,8 +13,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIThread>false</useUIThread>
diff --git a/build/parent/pom.xml b/build/parent/pom.xml
index b4818a7..021aa90 100644
--- a/build/parent/pom.xml
+++ b/build/parent/pom.xml
@@ -15,8 +15,7 @@
 		<!-- to build w/ latest 0.13.0-SNAPSHOT, run `mvn install -DtychoVersion=0.13.0-SNAPSHOT`, or uncomment this property:
 		<tychoVersion>0.13.0-SNAPSHOT</tychoVersion>
 		-->
-		<!-- <tychoVersion>0.12.0</tychoVersion> -->
-		<tychoVersion>0.10.0</tychoVersion>
+		<tychoVersion>0.12.0</tychoVersion>
 		<scmBranch>trunk</scmBranch>
 		<BUILD_ALIAS>M3</BUILD_ALIAS>
 		<memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1>
@@ -67,8 +66,8 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-packaging-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<format>'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}'</format>
@@ -99,15 +98,14 @@
 			</plugin>
 
 			<plugin>
-				<!-- TODO: change to org.eclipse.tycho 0.12.0 -->
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-maven-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<extensions>true</extensions>
 			</plugin>
 
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
+				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>target-platform-configuration</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
@@ -142,8 +140,8 @@
 				To allow all tests in a pom to pass/fail, use commandline flag: -fae (fail 
 				at end) -->
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<!-- timeout in seconds -->
@@ -189,8 +187,8 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<encoding>UTF-8</encoding>
@@ -205,12 +203,12 @@
 				</configuration>
 			</plugin>
 			<!-- these two plugins copied in from Chris Aniszczyk's Minerva parent 
-				pom; also need org.sonatype.tycho:maven-osgi-compiler-plugin, above -->
+				pom; also need org.eclipse.tycho:tycho-compiler-plugin, above -->
 			<!-- TODO remove workaround when https://issues.sonatype.org/browse/TYCHO-473 
 					is fixed -->
 			<!--plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-source-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-source-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<executions>
 					<execution>
@@ -363,7 +361,7 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
+						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>target-platform-configuration</artifactId>
 						<version>${tychoVersion}</version>
 						<configuration>
@@ -393,7 +391,7 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
+						<groupId>org.eclipse.tycho</groupId>
 						<artifactId>target-platform-configuration</artifactId>
 						<version>${tychoVersion}</version>
 						<configuration>
@@ -476,8 +474,8 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
-						<artifactId>maven-osgi-packaging-plugin</artifactId>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-packaging-plugin</artifactId>
 						<version>${tychoVersion}</version>
 						<configuration>
 							<format>'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}'
@@ -521,8 +519,8 @@
 						</configuration>
 					</plugin>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
-						<artifactId>maven-osgi-test-plugin</artifactId>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-surefire-plugin</artifactId>
 						<version>${tychoVersion}</version>
 						<configuration>
 							<systemProperties combine.children="append">
diff --git a/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
index 980a47b..6c45445 100644
--- a/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<explodedBundles>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
index 21e2b25..e03b659 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.seam.config.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
index 695eec5..5a9b264 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
index c6791c1..c4877fb 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.core.test/pom.xml
@@ -14,8 +14,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.seam.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
index 9c80bb1..e233848 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/pom.xml
@@ -14,8 +14,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.seam.faces.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
index 141f5c2..39c9240 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
index 5458160..19baec9 100644
--- a/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
index 968b085..71b9bff 100644
--- a/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.cdi.core.test</bundle>
diff --git a/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml b/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
index b7a8b5b..ab0b316 100644
--- a/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
+++ b/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<explodedBundles>
@@ -37,8 +37,8 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.sonatype.tycho</groupId>
-						<artifactId>maven-osgi-test-plugin</artifactId>
+						<groupId>org.eclipse.tycho</groupId>
+						<artifactId>tycho-surefire-plugin</artifactId>
 						<configuration>
 							<argLine>-XX:+UseLinuxPosixThreadCPUClocks -agentpath:/home/eskimo/Java/netbeans-7.0.1/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so=/home/eskimo/Java/netbeans-7.0.1/profiler/lib,5140</argLine>
 						</configuration>
diff --git a/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml b/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
index 62f0afd..f896c64 100644
--- a/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
+++ b/deltacloud/tests/org.jboss.tools.deltacloud.test/pom.xml
@@ -18,8 +18,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<excludes>
diff --git a/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml b/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
index 1cc465b..45b5b00 100644
--- a/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
+++ b/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml
@@ -21,8 +21,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.esb.project.core</bundle>
diff --git a/examples/tests/org.jboss.tools.project.examples.test/pom.xml b/examples/tests/org.jboss.tools.project.examples.test/pom.xml
index 8669b3c..c03db2d 100644
--- a/examples/tests/org.jboss.tools.project.examples.test/pom.xml
+++ b/examples/tests/org.jboss.tools.project.examples.test/pom.xml
@@ -18,8 +18,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIThread>false</useUIThread>
diff --git a/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml b/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
index eec47d4..6e509b2 100644
--- a/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
+++ b/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.hibernate.eclipse.console.test</bundle>
diff --git a/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml b/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
index f6ef727..17c75f1 100644
--- a/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
+++ b/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.hibernate.eclipse.jdt.ui.test</bundle>
diff --git a/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml b/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
index da34abf..bb0a2e9 100644
--- a/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
+++ b/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.hibernate.jpt.core.test</bundle>
diff --git a/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml b/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
index 3db9122..4aea717 100644
--- a/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
+++ b/jbpm/tests/org.jboss.tools.jbpm.convert.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.jbpm.convert.test</bundle>
diff --git a/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml b/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
index a3759c1..60e7041 100644
--- a/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
+++ b/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml
@@ -17,8 +17,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.jmx.core.test</bundle>
diff --git a/jsf/tests/org.jboss.tools.jsf.test/pom.xml b/jsf/tests/org.jboss.tools.jsf.test/pom.xml
index 6dcc981..a0823a5 100644
--- a/jsf/tests/org.jboss.tools.jsf.test/pom.xml
+++ b/jsf/tests/org.jboss.tools.jsf.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.jsf.test</bundle>
diff --git a/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml b/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
index c2785ba..4741098 100644
--- a/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
+++ b/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml
@@ -19,8 +19,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.jsf.vpe.ajax4jsf</bundle>
diff --git a/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml b/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
index f21cd42..903b9d8 100644
--- a/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
+++ b/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
diff --git a/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml b/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
index 90f795f..4eca968 100644
--- a/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
+++ b/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
diff --git a/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml b/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
index a1fa8ff..958ac8a 100644
--- a/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
+++ b/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.jsf.vpe.richfaces</bundle>
diff --git a/jsf/tests/pom.xml b/jsf/tests/pom.xml
index 857d6ab..16442cc 100644
--- a/jsf/tests/pom.xml
+++ b/jsf/tests/pom.xml
@@ -29,8 +29,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<!-- default is 1800 sec = 30 min -->
diff --git a/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml b/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
index bc2c982..23d72f3 100644
--- a/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
+++ b/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.jst.web.kb</bundle>
diff --git a/maven/tests/org.jboss.tools.maven.configurators.tests/pom.xml b/maven/tests/org.jboss.tools.maven.configurators.tests/pom.xml
index fd8d3d4..f4ae865 100644
--- a/maven/tests/org.jboss.tools.maven.configurators.tests/pom.xml
+++ b/maven/tests/org.jboss.tools.maven.configurators.tests/pom.xml
@@ -15,8 +15,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIThread>false</useUIThread>
diff --git a/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml b/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
index 0d5c67f..b1936c8 100644
--- a/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
+++ b/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
@@ -18,8 +18,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIThread>false</useUIThread>
diff --git a/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml b/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
index d992159..de23bc6 100644
--- a/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
+++ b/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml
@@ -14,8 +14,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<!-- not strictly needed but this suppresses warnings when compiling 
 					that the default value (1.5) is being overwritten by the value in the MANIFEST.MF -->
diff --git a/runtime/tests/org.jboss.tools.runtime.test/pom.xml b/runtime/tests/org.jboss.tools.runtime.test/pom.xml
index 5187b42..e454f0f 100644
--- a/runtime/tests/org.jboss.tools.runtime.test/pom.xml
+++ b/runtime/tests/org.jboss.tools.runtime.test/pom.xml
@@ -18,8 +18,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<testSuite>org.jboss.tools.runtime.test</testSuite>
diff --git a/seam/tests/org.jboss.tools.seam.core.test/pom.xml b/seam/tests/org.jboss.tools.seam.core.test/pom.xml
index c0a11ef..7c52436 100644
--- a/seam/tests/org.jboss.tools.seam.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml b/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
index cf3ed0b..1e71552 100644
--- a/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml
@@ -13,8 +13,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
diff --git a/seam/tests/org.jboss.tools.seam.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
index 62fa602..e069095 100644
--- a/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<explodedBundles>
diff --git a/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml b/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
index 514277d..ddecdc4 100644
--- a/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam121EAP.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
index df1c469..e5b6bb8 100644
--- a/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam121EAP.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml b/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
index 7221a6e..502d865 100644
--- a/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam201GA.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
index 992eb29..cc33c12 100644
--- a/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam201GA.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml b/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
index 3000fb7..652a669 100644
--- a/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam202SP1.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
index 56b042e..9d3d82f 100644
--- a/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam202SP1.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml b/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
index 8850e29..57f8d83 100644
--- a/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam203CR1.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
index 3aa11ea..de01a27 100644
--- a/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam203CR1.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml b/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
index 60d2b4c..b8f4a77 100644
--- a/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam211GA.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
index 87aaf87..4d6eccd 100644
--- a/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam211GA.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml b/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
index dfe9f2d..1d29c99 100644
--- a/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam212GA.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
index 74cea2e..74931cd 100644
--- a/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam212GA.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml b/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
index 30fad3f..c380ed0 100644
--- a/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam220CR1.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
index 92d9063..517878a 100644
--- a/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam220CR1.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml b/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
index a2461c1..9fcedb4 100644
--- a/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam220GA.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
index aa637ec..3204e34 100644
--- a/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam220GA.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml b/seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml
index 52055af..e0b66bb 100644
--- a/seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam221CR1.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml
index 06b32a5..d9e9839 100644
--- a/seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam221CR1.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml b/seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml
index 55116a8..1545217 100644
--- a/seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam221CR2.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml b/seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml
index a04b10b..865bd8e 100644
--- a/seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seam221CR2.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml b/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
index e4a0142..fd4e874 100644
--- a/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seamfp.core.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.core.test</bundle>
diff --git a/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml b/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
index a465cb8..f51ef20 100644
--- a/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
+++ b/seam/tests/org.jboss.tools.seamfp.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.seam.ui.test</bundle>
diff --git a/seam/tests/pom.xml b/seam/tests/pom.xml
index 9fa3ffa..719250b 100644
--- a/seam/tests/pom.xml
+++ b/seam/tests/pom.xml
@@ -48,8 +48,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<!-- default is 1800 sec = 30 min -->
diff --git a/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml b/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
index f56fbc9..1e02d7c 100644
--- a/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
+++ b/smooks/tests/org.jboss.tools.smooks.ui.bot.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
 						<include>org/jboss/tools/smooks/launch/serialize/ObjectSerializerTest.class</include>
diff --git a/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml b/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
index 75053a7..b2a3aed 100644
--- a/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
+++ b/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<includes>
 						<include>org/jboss/tools/smooks/launch/serialize/ObjectSerializerTest.class</include>
diff --git a/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml b/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
index c3d72fa..9c9069c 100644
--- a/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
+++ b/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
@@ -13,8 +13,8 @@
 		<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<skip>true</skip>
 				</configuration>
diff --git a/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml b/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
index 32d6fc4..41f6968 100644
--- a/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
+++ b/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml
@@ -17,8 +17,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<!-- timeout in seconds (60 mins) -->
 					<surefire.timeout>3600</surefire.timeout>
diff --git a/vpe/tests/org.jboss.tools.vpe.test/pom.xml b/vpe/tests/org.jboss.tools.vpe.test/pom.xml
index 0c70ab2..2423553 100644
--- a/vpe/tests/org.jboss.tools.vpe.test/pom.xml
+++ b/vpe/tests/org.jboss.tools.vpe.test/pom.xml
@@ -19,8 +19,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles>
 						<bundle>org.jboss.tools.vpe.test</bundle>
diff --git a/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml b/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
index bff8316..f6ca2de 100644
--- a/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
+++ b/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
@@ -13,8 +13,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<useUIThread>false</useUIThread>
diff --git a/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml b/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
index b4f607e..56c3f38 100644
--- a/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
+++ b/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml
@@ -20,8 +20,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<explodedBundles combine.children="append">
 						<bundle>org.jboss.tools.vpe.ui.test</bundle>
diff --git a/vpe/tests/pom.xml b/vpe/tests/pom.xml
index dfb7fbb..d8b940e 100644
--- a/vpe/tests/pom.xml
+++ b/vpe/tests/pom.xml
@@ -24,8 +24,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				<configuration>
 					<product>org.jboss.tools.tests.product</product>
 					<!-- default is 1800 sec = 30 min -->
diff --git a/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml b/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
index 447cfc0..3979baf 100644
--- a/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
+++ b/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml
@@ -21,8 +21,8 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<source>1.6</source>
@@ -30,8 +30,8 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-test-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
 				
 				<configuration>
 					<!-- timeout in seconds -->
diff --git a/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml b/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
index 4fd205a..03dbcb3 100644
--- a/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
+++ b/ws/tests/org.jboss.tools.ws.jaxrs.core.test/pom.xml
@@ -20,15 +20,15 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.sonatype.tycho</groupId>
-				<artifactId>maven-osgi-compiler-plugin</artifactId>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-compiler-plugin</artifactId>
 				<version>${tychoVersion}</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
 				</configuration>
 			</plugin>
-			<!-- plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-test-plugin</artifactId> 
+			<!-- plugin> <groupId>org.eclipse.tycho</groupId> <artifactId>tycho-surefire-plugin</artifactId> 
 				 <configuration> <useUIHarness>false</useUIHarness> 
 				<surefire.timeout>3600</surefire.timeout> <forkedProcessTimeoutInSeconds>3600</forkedProcessTimeoutInSeconds> 
 				<includes> <include>**/TestCase.class</include> <include>**/*TestSuite*.class</include> 
diff --git a/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml b/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml
index 6236177..b8b12df 100644
--- a/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml
+++ b/xulrunner/plugins/org.mozilla.xulrunner.cocoa.macosx/pom.xml
@@ -13,7 +13,7 @@
 	<build>
 	   <plugins>
 	     <plugin>
-  	       <groupId>org.sonatype.tycho</groupId>
+  	       <groupId>org.eclipse.tycho</groupId>
   	       <artifactId>target-platform-configuration</artifactId>
   	       <version>${tychoVersion}</version>
   	       <configuration>
diff --git a/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml b/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
index cd7dc87..a126e3a 100644
--- a/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
+++ b/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86/pom.xml
@@ -14,7 +14,7 @@
 	<build>
 	   <plugins>
 	     <plugin>
-  	       <groupId>org.sonatype.tycho</groupId>
+  	       <groupId>org.eclipse.tycho</groupId>
   	       <artifactId>target-platform-configuration</artifactId>
   	       <version>${tychoVersion}</version>
   	       <configuration>
diff --git a/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml b/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
index 3c78c3b..2a7fcc7 100644
--- a/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
+++ b/xulrunner/plugins/org.mozilla.xulrunner.gtk.linux.x86_64/pom.xml
@@ -16,7 +16,7 @@
 	<build>
 	   <plugins>
 	     <plugin>
-  	       <groupId>org.sonatype.tycho</groupId>
+  	       <groupId>org.eclipse.tycho</groupId>
   	       <artifactId>target-platform-configuration</artifactId>
   	       <version>${tychoVersion}</version>
   	       <configuration>
diff --git a/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml b/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
index d8b444d..ba32798 100644
--- a/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
+++ b/xulrunner/plugins/org.mozilla.xulrunner.win32.win32.x86/pom.xml
@@ -14,7 +14,7 @@
 	<build>
 	   <plugins>
 	     <plugin>
-  	       <groupId>org.sonatype.tycho</groupId>
+  	       <groupId>org.eclipse.tycho</groupId>
   	       <artifactId>target-platform-configuration</artifactId>
   	       <version>${tychoVersion}</version>
   	       <configuration>
