diff --git a/batch/features/org.jboss.tools.batch.test.feature/feature.xml b/batch/features/org.jboss.tools.batch.test.feature/feature.xml
index 964667eab8..5158909cdc 100644
--- a/batch/features/org.jboss.tools.batch.test.feature/feature.xml
+++ b/batch/features/org.jboss.tools.batch.test.feature/feature.xml
@@ -1,29 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.batch.test.feature" label="%featureName" version="1.7.0.qualifier" provider-name="%featureProvider">
+<feature
+      id="org.jboss.tools.batch.test.feature"
+      label="%featureName"
+      version="1.7.0.qualifier"
+      provider-name="%featureProvider">
 
-	<description>
+   <description>
       %description
    </description>
 
-	<copyright>
+   <copyright>
       %copyright
    </copyright>
 
-	<license url="%licenseURL">
+   <license url="%licenseURL">
       %license
    </license>
 
-	<requires>
-		<import plugin="org.junit" version="3.8.1" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible" />
-	</requires>
+   <requires>
+      <import feature="org.jboss.tools.batch.feature" version="1.7.0" match="greaterOrEqual"/>
+   </requires>
 
-	<plugin id="org.jboss.tools.batch.core.itest" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.batch.ui.itest" download-size="0" install-size="0" version="0.0.0" />
+   <plugin
+         id="org.jboss.tools.batch.core.itest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.batch.ui.itest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
 </feature>
diff --git a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
index ba5d0ecc1f..43949448a8 100644
--- a/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.deltaspike.test.feature/feature.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.deltaspike.test.feature" label="%featureName" version="1.7.0.qualifier" provider-name="%featureProvider">
+<feature
+      id="org.jboss.tools.cdi.deltaspike.test.feature"
+      label="%featureName"
+      version="1.7.0.qualifier"
+      provider-name="%featureProvider">
 
-	<description>
+   <description>
       %description
    </description>
 
-	<copyright>
+   <copyright>
       %copyright
    </copyright>
 
-	<license url="%licenseURL">
+   <license url="%licenseURL">
       %license
    </license>
 
-	<requires>
-		<import plugin="org.junit" version="3.8.1" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible" />
-		<import feature="org.jboss.tools.cdi.test.feature" version="1.5.0" match="compatible" />
-	</requires>
-	
-	<plugin id="org.jboss.tools.cdi.deltaspike.core.test" download-size="0" install-size="0" version="0.0.0" />
+   <requires>
+      <import feature="org.jboss.tools.cdi.deltaspike.feature" version="1.7.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.jboss.tools.cdi.deltaspike.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml
index bbadb3b94f..3011dd2117 100644
--- a/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.seam.test.feature/feature.xml
@@ -1,33 +1,60 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.seam.test.feature" label="%featureName" version="1.7.0.qualifier" provider-name="%featureProvider">
+<feature
+      id="org.jboss.tools.cdi.seam.test.feature"
+      label="%featureName"
+      version="1.7.0.qualifier"
+      provider-name="%featureProvider">
 
-	<description>
+   <description>
       %description
    </description>
 
-	<copyright>
+   <copyright>
       %copyright
    </copyright>
 
-	<license url="%licenseURL">
+   <license url="%licenseURL">
       %license
    </license>
 
-	<requires>
-		<import plugin="org.junit" version="3.8.1" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible" />
-		<import feature="org.jboss.tools.cdi.test.feature" version="1.5.0" match="compatible" />
-	</requires>
-	
-	<plugin id="org.jboss.tools.cdi.seam.config.core.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.seam.config.ui.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.seam.core.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.seam.faces.core.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.seam.solder.core.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.seam.text.ext.test" download-size="0" install-size="0" version="0.0.0" />
+   <requires>
+      <import feature="org.jboss.tools.cdi.seam.feature" version="1.7.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.config.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.config.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.faces.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.solder.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.seam.text.ext.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
 </feature>
diff --git a/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml b/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
index 081d4148f3..bc3ae29c62 100644
--- a/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
+++ b/cdi/features/org.jboss.tools.cdi.test.feature/feature.xml
@@ -1,31 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.cdi.test.feature" label="%featureName" version="1.7.0.qualifier" provider-name="%featureProvider">
+<feature
+      id="org.jboss.tools.cdi.test.feature"
+      label="%featureName"
+      version="1.7.0.qualifier"
+      provider-name="%featureProvider">
 
-	<description>
+   <description>
       %description
    </description>
 
-	<copyright>
+   <copyright>
       %copyright
    </copyright>
 
-	<license url="%licenseURL">
+   <license url="%licenseURL">
       %license
    </license>
 
-	<requires>
-		<import plugin="org.junit" version="3.8.1" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible" />
-		<import plugin="org.eclipse.ant.core" version="3.1.100" match="compatible" />
-		<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible" />
-		<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible" />
-	</requires>
-
-	<plugin id="org.jboss.tools.cdi.core.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.text.ext.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.ui.test" download-size="0" install-size="0" version="0.0.0" />
-	<plugin id="org.jboss.tools.cdi.extension.core.test" download-size="0" install-size="0" version="0.0.0" />
+   <requires>
+      <import feature="org.jboss.tools.cdi.feature" version="1.7.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.jboss.tools.cdi.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.text.ext.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.ui.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+   <plugin
+         id="org.jboss.tools.cdi.extension.core.test"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
 
 </feature>
diff --git a/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF b/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
index 0bebef0d9e..abc9d70522 100644
--- a/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
+++ b/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.jboss.tools.cdi.text.ext.test
 Bundle-Version: 1.7.0.qualifier
-Require-Bundle: org.junit;bundle-version="3.8.2",
+Require-Bundle: org.junit;bundle-version="4.12.0",
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.jface.text;bundle-version="3.5.0",
  org.eclipse.ui.ide;bundle-version="3.5.0",
diff --git a/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF b/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF
index 831787580d..16697cef3b 100644
--- a/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 3.7.0.qualifier
 Bundle-Activator: org.jboss.tools.jsf.vpe.jstl.test.JstlTestPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="3.8.2",
+ org.junit;bundle-version="4.12.0",
  org.jboss.tools.jsf.vpe.jstl;bundle-version="3.1.0",
  org.jboss.tools.jsf.vpe.facelets;bundle-version="3.1.0",
  org.jboss.tools.jsf.vpe.richfaces;bundle-version="3.1.0",
diff --git a/seam/tests/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF b/seam/tests/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
index 67b0310162..7d90b91ab5 100644
--- a/seam/tests/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
+++ b/seam/tests/org.jboss.tools.seam.base.test/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="3.7.100",
  org.eclipse.wst.common.frameworks;bundle-version="1.2.0",
  org.jboss.tools.seam.core,
  org.jboss.tools.tests,
- org.junit;bundle-version="3.8.2",
+ org.junit;bundle-version="4.12.0",
  org.jboss.tools.seam.ui,
  org.eclipse.ui;bundle-version="3.7.0",
  org.jboss.tools.common,