diff --git a/.gitignore b/.gitignore
index 749e075..1e8d462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,6 @@
 src.zip
 .fbwarnings
 javaCompiler...args
+
+# maven
+target/
diff --git a/features/org.eclipse.wst.xsl_tests.feature/pom.xml b/features/org.eclipse.wst.xsl_tests.feature/pom.xml
new file mode 100644
index 0000000..fa7cd75
--- /dev/null
+++ b/features/org.eclipse.wst.xsl_tests.feature/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl_tests.feature</artifactId>
+  <version>1.1.500-SNAPSHOT</version>
+  <packaging>eclipse-feature</packaging>
+</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..9d4f2d1
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.eclipse</groupId>
+    <artifactId>wtp-parent</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../wtp-parent</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+  <version>3.5.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+
+  <modules>
+    <module>features/org.eclipse.wst.xsl_tests.feature</module>
+
+    <module>tests/org.eclipse.wst.xsl.core.tests</module>
+    <module>tests/org.eclipse.wst.xsl.exslt.core.tests</module>
+    <module>tests/org.eclipse.wst.xsl.exslt.ui.tests</module>
+    <module>tests/org.eclipse.wst.xsl.jaxp.debug.test</module>
+    <module>tests/org.eclipse.wst.xsl.launching.tests</module>
+    <module>tests/org.eclipse.wst.xsl.tests</module>
+    <module>tests/org.eclipse.wst.xsl.ui.tests</module>
+  </modules>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.core.tests/pom.xml b/tests/org.eclipse.wst.xsl.core.tests/pom.xml
index fd04b6c..58b5c62 100644
--- a/tests/org.eclipse.wst.xsl.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.core.tests/pom.xml
@@ -1,32 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.core.tests</artifactId>
-   <version>1.0.300-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>XSLT Core Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.core.tests</artifactId>
+  <version>1.0.400-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>XSLT Core Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <!-- <configuration> -->
-            <!-- <testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite> -->
-            <!-- <testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass> -->
-            <!-- </configuration> -->
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <!-- <configuration> -->
+        <!-- <testSuite>org.eclipse.wst.xml.xpath2.processor.tests</testSuite> -->
+        <!-- <testClass>org.eclipse.wst.xml.xpath2.processor.test.AllPsychoPathTests</testClass> -->
+        <!-- </configuration> -->
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.exslt.core.tests/pom.xml b/tests/org.eclipse.wst.xsl.exslt.core.tests/pom.xml
index fe8b73b..336d8a3 100644
--- a/tests/org.eclipse.wst.xsl.exslt.core.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.exslt.core.tests/pom.xml
@@ -1,28 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.exslt.core.tests</artifactId>
-   <version>1.0.100-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>EXSLT Core Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.exslt.core.tests</artifactId>
+  <version>1.0.100-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>EXSLT Core Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.exslt.ui.tests/pom.xml b/tests/org.eclipse.wst.xsl.exslt.ui.tests/pom.xml
index 3409c19..b1f3b7e 100644
--- a/tests/org.eclipse.wst.xsl.exslt.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.exslt.ui.tests/pom.xml
@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.exslt.ui.tests</artifactId>
-   <version>1.0.100-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>EXSLT UI Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.exslt.ui.tests</artifactId>
+  <version>1.0.100-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>EXSLT UI Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <configuration>
-               <useUIHarness>true</useUIHarness>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml b/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml
index ce893b9..cfe6fd6 100644
--- a/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml
+++ b/tests/org.eclipse.wst.xsl.jaxp.debug.test/pom.xml
@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.jaxp.debug.tests</artifactId>
-   <version>1.1.0-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>JAXP Debug Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.jaxp.debug.test</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>JAXP Debug Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <configuration>
-               <useUIHarness>true</useUIHarness>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.launching.tests/pom.xml b/tests/org.eclipse.wst.xsl.launching.tests/pom.xml
index 719c357..3ab37b2 100644
--- a/tests/org.eclipse.wst.xsl.launching.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.launching.tests/pom.xml
@@ -1,53 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.launching.tests</artifactId>
-   <version>1.2.0-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>XSL Launching Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.launching.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>XSL Launching Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <configuration>
-               <useUIHarness>true</useUIHarness>
-               <dependencies>
-                  <dependency>
-                     <type>p2-installable-unit</type>
-                     <artifactId>org.eclipse.sdk.ide</artifactId>
-                     <version>0.0.0</version>
-                  </dependency>
-                  <dependency>
-                     <type>p2-installable-unit</type>
-                     <artifactId>org.apache.xalan</artifactId>
-                     <version>0.0.0</version>
-                  </dependency>
-                  <dependency>
-                        <groupId>org.eclipse.wst.xsl</groupId>
-                        <artifactId>org.eclipse.wst.xsl.core</artifactId>
-                        <version>1.1.0-SNAPSHOT</version>
-                  </dependency>
-                  <dependency>
-                        <groupId>org.eclipse.wst.xsl</groupId>
-                        <artifactId>org.eclipse.wst.xsl.xalan</artifactId>
-                        <version>1.0.1-SNAPSHOT</version>
-                  </dependency>
-               </dependencies>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <dependencies>
+            <dependency>
+              <type>p2-installable-unit</type>
+              <artifactId>org.eclipse.sdk.ide</artifactId>
+              <version>0.0.0</version>
+            </dependency>
+            <dependency>
+              <type>p2-installable-unit</type>
+              <artifactId>org.apache.xalan</artifactId>
+              <version>0.0.0</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.wst.xsl</groupId>
+              <artifactId>org.eclipse.wst.xsl.core</artifactId>
+              <version>1.1.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.wst.xsl</groupId>
+              <artifactId>org.eclipse.wst.xsl.xalan</artifactId>
+              <version>1.0.1-SNAPSHOT</version>
+            </dependency>
+          </dependencies>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.tests/pom.xml b/tests/org.eclipse.wst.xsl.tests/pom.xml
new file mode 100644
index 0000000..61f3de0
--- /dev/null
+++ b/tests/org.eclipse.wst.xsl.tests/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright (c) 2012, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    Thanh Ha (Eclipse Foundation) - initial implementation
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
+
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.tests</artifactId>
+  <version>1.2.0-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/tests/org.eclipse.wst.xsl.ui.tests/pom.xml b/tests/org.eclipse.wst.xsl.ui.tests/pom.xml
index 94b7f5f..4b0866f 100644
--- a/tests/org.eclipse.wst.xsl.ui.tests/pom.xml
+++ b/tests/org.eclipse.wst.xsl.ui.tests/pom.xml
@@ -1,31 +1,42 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
+<!--
+  Copyright (c) 2010, 2013 Eclipse Foundation and others.
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Distribution License v1.0
+  which accompanies this distribution, and is available at
+  http://www.eclipse.org/org/documents/edl-v10.php
+ 
+  Contributors:
+    David Carver - Initial implementation
+    Thanh Ha (Eclipse Foundation) - CBI Webtools implementation
+-->
 
-   <parent>
-      <groupId>org.eclipse.wst.xsl</groupId>
-      <artifactId>org.eclipse.wst.xsl-parent</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
-      <relativePath>../../development/athena/org.eclipse.wst.xsl.releng</relativePath>
-   </parent>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.webtools.sourceediting</groupId>
+    <artifactId>org.eclipse.webtools.sourceediting.xsl.tests</artifactId>
+    <version>3.5.0-SNAPSHOT</version>
+    <relativePath>../../</relativePath>
+  </parent>
 
-   <groupId>org.eclipse.wst.xsl</groupId>
-   <artifactId>org.eclipse.wst.xsl.ui.tests</artifactId>
-   <version>1.1.0-SNAPSHOT</version>
-   <packaging>eclipse-test-plugin</packaging>
-   <name>XSLT UI Tests</name>
+  <groupId>org.eclipse.webtools.sourceediting</groupId>
+  <artifactId>org.eclipse.wst.xsl.ui.tests</artifactId>
+  <version>1.1.100-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+  <name>XSLT UI Tests</name>
 
-   <build>
-      <plugins>
-         <plugin>
-            <groupId>org.sonatype.tycho</groupId>
-            <artifactId>maven-osgi-test-plugin</artifactId>
-            <version>${tycho-version}</version>
-            <configuration>
-               <useUIHarness>true</useUIHarness>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-</project>
\ No newline at end of file
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>