Bug 431853 - [CBI] Enable JUnit tests for webtools.jsf.tests repo
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-beanutils.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-beanutils.jar
new file mode 100644
index 0000000..98bfbb7
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-beanutils.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-collections.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-collections.jar
new file mode 100644
index 0000000..bf8bcd0
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-collections.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-digester.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-digester.jar
new file mode 100644
index 0000000..3656eb9
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-digester.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-logging.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-logging.jar
new file mode 100644
index 0000000..ef43682
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/commons-logging.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-api.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-api.jar
new file mode 100644
index 0000000..5396f23
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-api.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-impl.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-impl.jar
new file mode 100644
index 0000000..40b7c05
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jsf-impl.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jstl.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jstl.jar
new file mode 100644
index 0000000..a02abec
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/jstl.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.1/standard.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/standard.jar
new file mode 100644
index 0000000..bc528ac
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.1/standard.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.2/glassfish.jstl_1.2.0.1.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/glassfish.jstl_1.2.0.1.jar
new file mode 100644
index 0000000..c0fa0bf
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/glassfish.jstl_1.2.0.1.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-api.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-api.jar
new file mode 100644
index 0000000..4b69d4f
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-api.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-impl.jar b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-impl.jar
new file mode 100644
index 0000000..bcf6a00
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V1.2/jsf-impl.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-api.jar b/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-api.jar
new file mode 100644
index 0000000..e667fdd
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-api.jar
Binary files differ
diff --git a/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-impl.jar b/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-impl.jar
new file mode 100644
index 0000000..cb603e6
--- /dev/null
+++ b/jsf/tests/jsfRuntimeJarsDirectory/V2.0/jsf-impl.jar
Binary files differ
diff --git a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
index ddd7e13..c1e427c 100644
--- a/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.common.runtime.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.common.runtime.tests</artifactId>
   <version>1.4.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.common.runtime.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.common.runtime.tests.AllRuntimeTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
index 74cb8f0..5d0faaf 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/META-INF/MANIFEST.MF
@@ -20,7 +20,8 @@
  org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",

  org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",

- org.eclipse.emf.ecore

+ org.eclipse.emf.ecore,

+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,1.5.0)"

 Bundle-ActivationPolicy: lazy

 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Export-Package: org.eclipse.jst.jsf.contentassist.tests;x-internal:=true

diff --git a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
index 8393af2..1396d49 100644
--- a/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.contentassist.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.contentassist.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.contentassist.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.contentassist.tests.AllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
index 6215a8a..836a182 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.context.symbol.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.context.symbol.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.context.symbol.tests.AllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
index afb1013..2f1de1a 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.core.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.core.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.core.tests.AllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
index 2e86556..e977b09 100644
--- a/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.designtime.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.designtime.tests</artifactId>
   <version>1.15.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.designtime.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.designtime.tests.AllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
index 0b91ecc..f17d0c3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.facesconfig.tests</artifactId>
   <version>1.4.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.facesconfig.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.facesconfig.tests.AllFacesConfigTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
index 62b883f..3212c1b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.facesconfig.ui.test/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.facesconfig.ui.test</artifactId>
   <version>1.4.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.facesconfig.ui.test</testSuite>
+          <testClass>org.eclipse.jst.jsf.facesconfig.ui.test.AllTestCases</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
index 4d70887..d4205c1 100644
--- a/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.metadata.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.metadata.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.metadata.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.metadata.tests.AllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
index 4f93b63..52676af 100644
--- a/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.ui.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.ui.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.ui.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.ui.tests.JSFUIAllTests</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
index 22a4d2a..d6636b3 100644
--- a/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.validation.el.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.validation.el.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.jsf.validation.el.tests</testSuite>
+          <testClass>org.eclipse.jst.jsf.validation.el.tests.AllTests_1_1</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
index be41537..b7bd4eb 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
@@ -27,7 +27,8 @@
  org.eclipse.jst.pagedesigner.jsf.ui;bundle-version="[1.1.0,2.0.0)",

  org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",

  org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",

- org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)"

+ org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",

+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,1.5.0)"

 Export-Package: org.eclipse.jst.pagedesigner.tests;x-internal:=true

 Bundle-ClassPath: pagedesignertests.jar

 Bundle-Activator: org.eclipse.jst.pagedesigner.tests.PageDesignerTestsPlugin

diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
index 1728efa..74e4fee 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/pom.xml
@@ -8,6 +8,7 @@
  
   Contributors:
     Thanh Ha (Eclipse Foundation) - initial implementation
+    Ian Trimble (Oracle) - initial tests configuration
 -->
 
 <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"
@@ -23,5 +24,20 @@
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.pagedesigner.tests</artifactId>
   <version>1.5.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
+  <packaging>eclipse-test-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <configuration>
+          <useUIHarness>true</useUIHarness>
+          <testSuite>org.eclipse.jst.pagedesigner.tests</testSuite>
+          <testClass>org.eclipse.jst.pagedesigner.tests.AllTests_Part1</testClass>
+          <argLine>-DjsfRuntimeJarsDirectoryV1.1=../jsfRuntimeJarsDirectory/V1.1 -DjsfRuntimeJarsDirectoryV1.2=../jsfRuntimeJarsDirectory/V1.2 -DjsfRuntimeJarsDirectoryV2.0=../jsfRuntimeJarsDirectory/V2.0</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>