diff --git a/dependencymanager/test2/pom.xml b/dependencymanager/test2/pom.xml
index d410b2a..6ded410 100644
--- a/dependencymanager/test2/pom.xml
+++ b/dependencymanager/test2/pom.xml
@@ -24,11 +24,11 @@
 		<relativePath>../../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.apache.felix.dependencymanager.test2</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.apache.felix.dependencymanager.test</artifactId>
+	<version>3.0.1-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
-	<name>Apache Felix Dependency Manager Integration Tests 2</name>
+	<name>Apache Felix Dependency Manager Integration Tests</name>
 
 	<properties>
 		<bundle.build.name>
@@ -146,8 +146,8 @@
 				<configuration>
 					<instructions>
 						<Bundle-Name>Apache Felix Dependency Manager Annotations Tests</Bundle-Name>
-						<Bundle-SymbolicName>org.apache.felix.dependencymanager.test2.components</Bundle-SymbolicName>
-						<Export-Package>org.apache.felix.dependencymanager.test2.components</Export-Package>
+						<Bundle-SymbolicName>org.apache.felix.dependencymanager.test.components</Bundle-SymbolicName>
+						<Export-Package>org.apache.felix.dm.test.components</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -161,7 +161,7 @@
 				</configuration>
 			</plugin>
 			
-			<!-- DM annotation plugin used to parse annotations from org.apache.felix.dependencymanager.test2.components artifact -->
+			<!-- DM annotation plugin used to parse annotations from org.apache.felix.dm.test.components artifact -->
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.dependencymanager.annotation</artifactId>
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
index a2a4a00..c9e7947 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterAnnotation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Map;
 
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
index 411d6d9..50d3e1f 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AdapterServiceTestWithPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AdapterServiceTestWithPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
index abe7fc5..e9e63f1 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectAnnotation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.AspectService;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
index cb50278..3a2e6f5 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleAnnotation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.AspectService;
 import org.apache.felix.dm.annotation.api.Component;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
index 023f60d..5af79b3 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/AspectLifecycleWithDynamicProxyAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/AspectLifecycleWithDynamicProxyAnnotation.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
index 5f3a138..0403c33 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleAdapterServiceTestWithPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleAdapterServiceTestWithPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
index 96cefc6..7dc3c8e 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/BundleDependencyAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/BundleDependencyAnnotation.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.BundleAdapterService;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
index 15e61b9..9c2873d 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/CompositeAnnotations.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/CompositeAnnotations.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java
index 0cbdb73..2dbf9a4 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Ensure.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Ensure.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.io.PrintStream;
 
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
index 844d730..871d17a 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAdapterServiceProperties.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAdapterServiceProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
index 3b0b40d..00c65a9 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraAspectServiceProperties.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraAspectServiceProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
index e233acd..2c29617 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraFactoryServiceProperties.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraFactoryServiceProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
index 5f931e4..54f1916 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ExtraServiceProperties.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ExtraServiceProperties.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
index ce2fa14..57ad770 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterAnnotation.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
index 1dff92a..03b5b54 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryConfigurationAdapterServiceTestWithPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.io.IOException;
 import java.util.Dictionary;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
index 31af18e..c9f9574 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/FactoryServiceTestWthPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/FactoryServiceTestWthPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
index aa0975a..2a19d87 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Felix4050.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Felix4050.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
index 80a09ab..eb6c90c 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/MultipleAnnotations.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/MultipleAnnotations.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.Composition;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
index 480c79f..e02f5a3 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/PropagateAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/PropagateAnnotation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Map;
 
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
index 58a35dc..291d2a7 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAdapterServiceTestWithPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAdapterServiceTestWithPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.net.URL;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
similarity index 99%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
index de69562..0204d4a 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ResourceAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ResourceAnnotation.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.net.URL;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
index cbd2bc2..45f34f3 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceFactoryAnnotation.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceFactoryAnnotation.java
@@ -16,7 +16,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.Dictionary;
 import java.util.HashMap;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
similarity index 97%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
index d834619..eabd3ff 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/ServiceTestWthPublisher.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/ServiceTestWthPublisher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
similarity index 98%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
index 45287d2..1ac78aa 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/SimpleAnnotations.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/SimpleAnnotations.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.Component;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
similarity index 96%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
index b805ff1..c022c45 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/TemporalAnnotations.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/TemporalAnnotations.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 import org.apache.felix.dm.annotation.api.Component;
 import org.apache.felix.dm.annotation.api.ServiceDependency;
diff --git a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java
similarity index 95%
rename from dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java
rename to dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java
index aec4356..98b5235 100644
--- a/dependencymanager/test2/src/main/java/org/apache/felix/dependencymanager/test2/components/Utils.java
+++ b/dependencymanager/test2/src/main/java/org/apache/felix/dm/test/components/Utils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.components;
+package org.apache.felix.dm.test.components;
 
 public class Utils {
     public static void schedule(final Runnable task, final long n) {
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
similarity index 80%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
index 2e6b9e7..34dcf64 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AdapterAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AdapterAnnotationTest.java
@@ -16,15 +16,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1Impl;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S1ToS3AdapterCallback;
-import org.apache.felix.dependencymanager.test2.components.AdapterAnnotation.S2Impl;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1Impl;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterAutoConfig;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterAutoConfigField;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S1ToS3AdapterCallback;
+import org.apache.felix.dm.test.components.AdapterAnnotation.S2Impl;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
similarity index 76%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
index e6cf886..6e7bdfe 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectAnnotationTest.java
@@ -16,15 +16,15 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect1;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect2;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceAspect3;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceConsumer;
-import org.apache.felix.dependencymanager.test2.components.AspectAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect1;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect2;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceAspect3;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceConsumer;
+import org.apache.felix.dm.test.components.AspectAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
similarity index 82%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
index 5c8074b..5d0e48e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleAnnotationTest.java
@@ -16,12 +16,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleAnnotation.ServiceProviderAspect;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectLifecycleAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.components.AspectLifecycleAnnotation.ServiceProviderAspect;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
similarity index 82%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
index 5028a1f..0f25892 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/AspectLifecycleWithDynamicProxyAnnotationTest.java
@@ -16,12 +16,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.components.AspectLifecycleWithDynamicProxyAnnotation.ServiceProviderAspect;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
similarity index 86%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
index f157650..8b4f736 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/BundleDependencyAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/BundleDependencyAnnotationTest.java
@@ -16,11 +16,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.BundleDependencyAnnotation;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.BundleDependencyAnnotation;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
similarity index 76%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
index 049120d..2c54154 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/CompositeAnnotationsTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/CompositeAnnotationsTest.java
@@ -16,13 +16,13 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.CompositeAnnotations.C1;
-import org.apache.felix.dependencymanager.test2.components.CompositeAnnotations.Dependency1;
-import org.apache.felix.dependencymanager.test2.components.CompositeAnnotations.Dependency2;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.CompositeAnnotations.C1;
+import org.apache.felix.dm.test.components.CompositeAnnotations.Dependency1;
+import org.apache.felix.dm.test.components.CompositeAnnotations.Dependency2;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
similarity index 82%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
index 75185e0..0f32299 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ExtraServicePropertiesTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ExtraServicePropertiesTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.ExtraAdapterServiceProperties;
-import org.apache.felix.dependencymanager.test2.components.ExtraAspectServiceProperties;
-import org.apache.felix.dependencymanager.test2.components.ExtraFactoryServiceProperties;
-import org.apache.felix.dependencymanager.test2.components.ExtraServiceProperties;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.ExtraAdapterServiceProperties;
+import org.apache.felix.dm.test.components.ExtraAspectServiceProperties;
+import org.apache.felix.dm.test.components.ExtraFactoryServiceProperties;
+import org.apache.felix.dm.test.components.ExtraServiceProperties;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
similarity index 89%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
index 11e39a4..a6a2527 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/FactoryConfigurationAdapterAnnotationTest.java
@@ -16,16 +16,16 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
 import java.io.IOException;
 import java.util.Hashtable;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.FactoryConfigurationAdapterAnnotation.ServiceProvider;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.FactoryConfigurationAdapterAnnotation.ServiceProvider;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
similarity index 85%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
index ec912f8..d050d0c 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/Felix4050Test.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/Felix4050Test.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.Felix4050;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.Felix4050;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
similarity index 83%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
index 5e4fd5f..285f4a3 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/MultipleAnnotationsTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/MultipleAnnotationsTest.java
@@ -16,11 +16,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.MultipleAnnotations;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.MultipleAnnotations;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
similarity index 83%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
index cf63740..0f87810 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PropagateAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PropagateAnnotationTest.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.PropagateAnnotation;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.PropagateAnnotation;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
similarity index 80%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
index 0f37e54..2c7ad60 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/PublisherAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/PublisherAnnotationTest.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.AdapterServiceTestWithPublisher;
-import org.apache.felix.dependencymanager.test2.components.BundleAdapterServiceTestWithPublisher;
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.FactoryConfigurationAdapterServiceTestWithPublisher;
-import org.apache.felix.dependencymanager.test2.components.FactoryServiceTestWthPublisher;
-import org.apache.felix.dependencymanager.test2.components.ResourceAdapterServiceTestWithPublisher;
-import org.apache.felix.dependencymanager.test2.components.ServiceTestWthPublisher;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.AdapterServiceTestWithPublisher;
+import org.apache.felix.dm.test.components.BundleAdapterServiceTestWithPublisher;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.FactoryConfigurationAdapterServiceTestWithPublisher;
+import org.apache.felix.dm.test.components.FactoryServiceTestWthPublisher;
+import org.apache.felix.dm.test.components.ResourceAdapterServiceTestWithPublisher;
+import org.apache.felix.dm.test.components.ServiceTestWthPublisher;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
similarity index 89%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
index 737dfb1..d59fb7a 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ResourceAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ResourceAnnotationTest.java
@@ -16,11 +16,11 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.ResourceAnnotation;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.ResourceAnnotation;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
similarity index 89%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
index 8cceff1..9cc0a5a 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/ServiceFactoryAnnotationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/ServiceFactoryAnnotationTest.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
 import java.util.Hashtable;
 import java.util.Set;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.ServiceFactoryAnnotation;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.annotation.api.Component;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.ServiceFactoryAnnotation;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
similarity index 81%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
index ae96b79..54c3b61 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/SimpleAnnotationsTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/SimpleAnnotationsTest.java
@@ -16,12 +16,12 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.SimpleAnnotations.Consumer;
-import org.apache.felix.dependencymanager.test2.components.SimpleAnnotations.Producer;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.SimpleAnnotations.Consumer;
+import org.apache.felix.dm.test.components.SimpleAnnotations.Producer;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
similarity index 87%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
index a24cb43..c5b736c 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/annotations/TemporalAnnotationsTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/annotations/TemporalAnnotationsTest.java
@@ -16,14 +16,14 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.felix.dependencymanager.test2.integration.annotations;
+package org.apache.felix.dm.test.integration.annotations;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.components.TemporalAnnotations;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.components.TemporalAnnotations;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
similarity index 93%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
index 00cb527..46f4cb9 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AbstractServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AbstractServiceDependencyTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
index 290b265..6eab1db 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterAndConsumerTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterAndConsumerTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
index 284693a..11106b5 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectCallbacksTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectCallbacksTest.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
index 7e5f15b..9af51db 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithAspectTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithAspectTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
index 7c4de88..fcb82a5 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithExtraDependenciesTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithExtraDependenciesTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
index a6ed4f8..6c8cc49 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AdapterWithInstanceBoundDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AdapterWithInstanceBoundDependencyTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
similarity index 93%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
index 0e7f776..a37abb4 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectAwareServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectAwareServiceDependencyTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
index ddd65d0..07b6233 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectBaseTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectBaseTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,11 +24,11 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
index cf0591b..6eda2f4 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectChainTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectChainTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
index 5fccdf4..ccc636f 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectDynamicsTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectDynamicsTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
index bd634fd..2de432e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectRaceTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectRaceTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.HashSet;
 import java.util.Hashtable;
@@ -28,10 +28,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
index 5f6f0bf..96fc74e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/AspectWhiteboardTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/AspectWhiteboardTest.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
index 97b20c7..bf3c4ee 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/BundleDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/BundleDependencyTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
index 2377b81..62eb1fd 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ComponentLifeCycleTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ComponentLifeCycleTest.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.ComponentStateListener;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
index f0d5b2a..0ce920e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CompositionTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CompositionTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
index c68cb2f..628ec47 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ConfigurationDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ConfigurationDependencyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -25,10 +25,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
index 4feae47..8f54268 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/CustomDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/CustomDependencyTest.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.ArrayList;
 import java.util.Dictionary;
 import java.util.List;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Dependency;
 import org.apache.felix.dm.DependencyActivation;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.DependencyService;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
index c410d0f..0024295 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/DynamicProxyAspectTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/DynamicProxyAspectTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -24,10 +24,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
index f6ac448..435a628 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2078_ServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2078_ServiceDependencyTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
index 1f90d70..ed77679 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithAutoConfigTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
index 4cc9c06..0879784 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2344_ExtraDependencyWithCallbackTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 /**
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
index c4c4edb..9e5ffd6 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2348_ResourceAdapterTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2348_ResourceAdapterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -29,11 +29,11 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
index d3dc744..ca59474 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2369_ExtraDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2369_ExtraDependencyTest.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Arrays;
 import java.util.List;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 /**
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
index 1ab9e2c..241e40c 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2696_ConfigurationAndServiceDependencyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -24,10 +24,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
index 57d75c7..65e4d2d 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX2955_ShellCommandTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX2955_ShellCommandTest.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.apache.felix.shell.ShellService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
similarity index 93%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
index 3b7d06a..92f9c99 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3008_FilterIndexStartupTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3008_FilterIndexStartupTest.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor;
 //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
similarity index 93%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
index f02ee32..21188e3 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3057_EmptyServiceReferenceArray.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3057_EmptyServiceReferenceArray.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor;
 //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
index 4415afd..64fdf87 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3186_AspectAdapterTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3186_AspectAdapterTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
index 2d007fa..f6c1bb4 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FELIX3337_UpdatedConfigurationDependencyWithPropagationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -25,10 +25,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
index 4d5ff9a..89dd853 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FactoryConfigurationAdapterTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FactoryConfigurationAdapterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.IOException;
 import java.util.Dictionary;
@@ -26,10 +26,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
index faba72c..c97c686 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/FilterIndexResourceAdapterTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/FilterIndexResourceAdapterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor;
 //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
@@ -31,12 +31,12 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
 import org.apache.felix.dm.ServiceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
index 8cd3ebb..7868795 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependenciesTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependenciesTest.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.ArrayList;
 import java.util.Hashtable;
 import java.util.List;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
index 6e06497..2ff18b0 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Hashtable;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 /**
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
index da51238..489d0ff 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleExtraDependencyTest2.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleExtraDependencyTest2.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Hashtable;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
index f88625a..d606e83 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/MultipleServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/MultipleServiceDependencyTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Properties;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
index 25033fb..52f6fd6 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -26,8 +26,6 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.ComponentStateListener;
 import org.apache.felix.dm.Dependency;
@@ -35,6 +33,8 @@
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
index 5a72fba..309d1a1 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterDependencyAddAndRemoveTest2.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -27,8 +27,6 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.ComponentStateListener;
 import org.apache.felix.dm.Dependency;
@@ -36,6 +34,8 @@
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
index a2027e6..32a48e4 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceAdapterTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceAdapterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -29,11 +29,11 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
index de8aa32..abfa09e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ResourceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ResourceDependencyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
@@ -29,12 +29,12 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
index 299da1b..ae8122e 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyComponentLifeCycleTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyComponentLifeCycleTest.java
@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 //import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartupFor;
 //import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
index 89944b3..6f61524 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyInjectionTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyInjectionTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
similarity index 95%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
index aea36b8..de31eab 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyPropagateTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyPropagateTest.java
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.Map;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
similarity index 93%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
index 639365c..b1720c7 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
index daef838..d25fac0 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceDependencyThroughCallbackInstanceTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
index fca373b..e90c3bd 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceTrackerTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceTrackerTest.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.util.Hashtable;
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ServiceUtil;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.apache.felix.dm.tracker.ServiceTracker;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
index 9322b31..95b1a7d 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/ServiceUpdateTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/ServiceUpdateTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -29,12 +29,12 @@
 
 import junit.framework.Assert;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
similarity index 97%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
index 51669b8..608f7ff 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/SharingDependenciesWithMultipleServicesTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/SharingDependenciesWithMultipleServicesTest.java
@@ -16,14 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
 import java.net.URL;
 import java.util.Dictionary;
 import java.util.Hashtable;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.BundleDependency;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.ConfigurationDependency;
@@ -32,6 +30,8 @@
 import org.apache.felix.dm.ResourceHandler;
 import org.apache.felix.dm.ResourceUtil;
 import org.apache.felix.dm.ServiceDependency;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
similarity index 94%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
index e6e5a5b..c7bf84b 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/api/TemporalServiceDependencyTest.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/api/TemporalServiceDependencyTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.api;
+package org.apache.felix.dm.test.integration.api;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
-import org.apache.felix.dependencymanager.test2.integration.common.TestBase;
 import org.apache.felix.dm.Component;
 import org.apache.felix.dm.DependencyManager;
+import org.apache.felix.dm.test.components.Ensure;
+import org.apache.felix.dm.test.integration.common.TestBase;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.junit.PaxExam;
diff --git a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
similarity index 96%
rename from dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
rename to dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
index 9b037d3..2362b4a 100644
--- a/dependencymanager/test2/src/test/java/org/apache/felix/dependencymanager/test2/integration/common/TestBase.java
+++ b/dependencymanager/test2/src/test/java/org/apache/felix/dm/test/integration/common/TestBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.dependencymanager.test2.integration.common;
+package org.apache.felix.dm.test.integration.common;
 
 import static org.ops4j.pax.exam.CoreOptions.bundle;
 import static org.ops4j.pax.exam.CoreOptions.cleanCaches;
@@ -35,7 +35,7 @@
 
 import javax.inject.Inject;
 
-import org.apache.felix.dependencymanager.test2.components.Ensure;
+import org.apache.felix.dm.test.components.Ensure;
 import org.junit.After;
 import org.junit.Before;
 import org.ops4j.pax.exam.Configuration;
@@ -58,7 +58,6 @@
 import ch.qos.logback.classic.Logger;
 
 public abstract class TestBase implements LogService, FrameworkListener {
-    public static final String OSGI_SPEC_VERSION = "4.2.0";
     private final static int LOG_LEVEL = LogService.LOG_WARNING;
     private volatile boolean m_errorsLogged;
 
@@ -67,7 +66,7 @@
     protected static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file";
 
     // the default bundle jar file name
-    protected static final String BUNDLE_JAR_DEFAULT = "target/org.apache.felix.dependencymanager.test2-3.0.2-SNAPSHOT.jar";
+    protected static final String BUNDLE_JAR_DEFAULT = "target/org.apache.felix.dependencymanager.test-3.0.1-SNAPSHOT.jar";
 
     // the JVM option to set to enable remote debugging
     protected static final String DEBUG_VM_OPTION = "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=30303";
@@ -129,7 +128,7 @@
     @ProbeBuilder
     public TestProbeBuilder buildProbe(TestProbeBuilder builder) {
         return builder.setHeader(Constants.IMPORT_PACKAGE,
-                "org.apache.felix.dependencymanager.test2.components");
+                "org.apache.felix.dm.test.components");
     }
 
     @Before
@@ -141,7 +140,7 @@
     @After
     public void tearDown() throws BundleException {
        logService.unregister();
-        context.removeFrameworkListener(this);
+       context.removeFrameworkListener(this);
     }
 
     /**
@@ -183,7 +182,7 @@
      * Stops our test components bundle.
      */
     protected void stopTestComponentsBundle() {
-        stopBundle("org.apache.felix.dependencymanager.test2.components");
+        stopBundle("org.apache.felix.dependencymanager.test.components");
     }
 
     /**