diff --git a/releng/org.eclipse.cdt-feature/feature.xml b/releng/org.eclipse.cdt-feature/feature.xml
index 5201df27a39..408ba19b84b 100644
--- a/releng/org.eclipse.cdt-feature/feature.xml
+++ b/releng/org.eclipse.cdt-feature/feature.xml
@@ -13,7 +13,7 @@
       %description
    </description>
 
-   <license>
+   <license url="%licenseURL">
       %license
    </license>
 
@@ -21,10 +21,6 @@
       <update label="%updateSiteName" url="http://update.eclipse.org/updates"/>
    </url>
 
-   <requires>
-      <import plugin="org.eclipse.platform" version="2.0.0" match="compatible"/>
-   </requires>
-
    <plugin
          id="org.eclipse.cdt.core"
          download-size="0"
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index 460326fd08b..abcb3af826d 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -13,7 +13,7 @@
       %description
    </description>
 
-   <license>
+   <license url="%licenseURL">
       %license
    </license>
 
@@ -22,8 +22,9 @@
    </url>
 
    <requires>
-      <import plugin="org.eclipse.cdt.core" version="1.0.1" match="equivalent"/>
-      <import plugin="org.eclipse.test" version="2.1.0" match="compatible"/>
+      <import plugin="org.eclipse.platform" version="2.0.0" match="compatible"/>
+      <import plugin="org.eclipse.cdt" version="1.0.1" match="equivalent"/>
+      <import plugin="org.eclipse.test" version="2.1.0" match="equivalent"/>
    </requires>
 
    <plugin