diff --git a/ipojo/tests/api/pom.xml b/ipojo/tests/api/pom.xml
index ba655c3..1f974e7 100644
--- a/ipojo/tests/api/pom.xml
+++ b/ipojo/tests/api/pom.xml
@@ -64,6 +64,7 @@
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+      <version>${ipojo.manipulator.snapshot}</version>
     </dependency>
 
     <!-- For external handler management -->
diff --git a/ipojo/tests/composite/composite-runtime/pom.xml b/ipojo/tests/composite/composite-runtime/pom.xml
index bee61c0..e8d6b05 100644
--- a/ipojo/tests/composite/composite-runtime/pom.xml
+++ b/ipojo/tests/composite/composite-runtime/pom.xml
@@ -92,6 +92,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/composite/import-export/pom.xml b/ipojo/tests/composite/import-export/pom.xml
index 2981c2d..388c180 100644
--- a/ipojo/tests/composite/import-export/pom.xml
+++ b/ipojo/tests/composite/import-export/pom.xml
@@ -94,6 +94,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/core/annotations/pom.xml b/ipojo/tests/core/annotations/pom.xml
index 6644544..d1a0a71 100644
--- a/ipojo/tests/core/annotations/pom.xml
+++ b/ipojo/tests/core/annotations/pom.xml
@@ -114,7 +114,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/core/service-providing/pom.xml b/ipojo/tests/core/service-providing/pom.xml
index 47b3216..eff64c8 100644
--- a/ipojo/tests/core/service-providing/pom.xml
+++ b/ipojo/tests/core/service-providing/pom.xml
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/handler/eventadmin/pom.xml b/ipojo/tests/handler/eventadmin/pom.xml
index b695b2b..73f366a 100644
--- a/ipojo/tests/handler/eventadmin/pom.xml
+++ b/ipojo/tests/handler/eventadmin/pom.xml
@@ -88,7 +88,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-ipojo-plugin</artifactId>
-                <version>1.8.4</version>
+                <version>${ipojo.manipulator.snapshot}</version>
                 <executions>
                     <execution>
                         <goals>
diff --git a/ipojo/tests/integration-tests/pom.xml b/ipojo/tests/integration-tests/pom.xml
index 603df79..3c01ba9 100644
--- a/ipojo/tests/integration-tests/pom.xml
+++ b/ipojo/tests/integration-tests/pom.xml
@@ -62,34 +62,31 @@
         <dependency>
             <groupId>ipojo.tests</groupId>
             <artifactId>tests.manipulation.metadata</artifactId>
-            <version>${ipojo.core.snapshot}</version>
+            <version>${ipojo.manipulator.snapshot}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ipojo.tests</groupId>
             <artifactId>tests.manipulation</artifactId>
-            <version>${ipojo.core.snapshot}</version>
+            <version>${ipojo.manipulator.snapshot}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ipojo.tests</groupId>
-            <artifactId>tests.manipulation.primitives
-      </artifactId>
-            <version>${ipojo.core.snapshot}</version>
+            <artifactId>tests.manipulation.primitives</artifactId>
+            <version>${ipojo.manipulator.snapshot}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ipojo.tests</groupId>
-            <artifactId>tests.manipulation.creation
-      </artifactId>
-            <version>${ipojo.core.snapshot}</version>
+            <artifactId>tests.manipulation.creation</artifactId>
+            <version>${ipojo.manipulator.snapshot}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>ipojo.tests</groupId>
-            <artifactId>tests.manipulation.java5
-      </artifactId>
-            <version>${ipojo.core.snapshot}</version>
+            <artifactId>tests.manipulation.java5</artifactId>
+            <version>${ipojo.manipulator.snapshot}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/ipojo/tests/manipulator/creation/pom.xml b/ipojo/tests/manipulator/creation/pom.xml
index a3f3dbd..455fee8 100644
--- a/ipojo/tests/manipulator/creation/pom.xml
+++ b/ipojo/tests/manipulator/creation/pom.xml
@@ -29,7 +29,7 @@
   <name>iPOJO Creation Manipulation Test Suite</name>
   <artifactId>tests.manipulation.creation</artifactId>
   <groupId>ipojo.tests</groupId>
-  <version>${ipojo.core.snapshot}</version>
+  <version>${ipojo.manipulator.snapshot}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/manipulator/manipulation/pom.xml b/ipojo/tests/manipulator/manipulation/pom.xml
index 9a19c78..df6095a 100644
--- a/ipojo/tests/manipulator/manipulation/pom.xml
+++ b/ipojo/tests/manipulator/manipulation/pom.xml
@@ -29,7 +29,7 @@
   <name>iPOJO Manipulation Test Suite</name>
   <artifactId>tests.manipulation</artifactId>
   <groupId>ipojo.tests</groupId>
-  <version>${ipojo.core.snapshot}</version>
+  <version>${ipojo.manipulator.snapshot}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/manipulator/manipulator-java5/pom.xml b/ipojo/tests/manipulator/manipulator-java5/pom.xml
index 57d39b4..7c68ac9 100644
--- a/ipojo/tests/manipulator/manipulator-java5/pom.xml
+++ b/ipojo/tests/manipulator/manipulator-java5/pom.xml
@@ -29,7 +29,7 @@
   <name>iPOJO Manipulation Test Suite For Java 5</name>
   <artifactId>tests.manipulation.java5</artifactId>
   <groupId>ipojo.tests</groupId>
-  <version>${ipojo.core.snapshot}</version>
+  <version>${ipojo.manipulator.snapshot}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/manipulator/metadata/pom.xml b/ipojo/tests/manipulator/metadata/pom.xml
index b4ab099..4eb056b 100644
--- a/ipojo/tests/manipulator/metadata/pom.xml
+++ b/ipojo/tests/manipulator/metadata/pom.xml
@@ -29,7 +29,7 @@
   <name>iPOJO Manipulation Metadata Test Suite</name>
   <artifactId>tests.manipulation.metadata</artifactId>
   <groupId>ipojo.tests</groupId>
-  <version>${ipojo.core.snapshot}</version>
+  <version>${ipojo.manipulator.snapshot}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-                <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/manipulator/primitives/pom.xml b/ipojo/tests/manipulator/primitives/pom.xml
index ea1dd25..921bc1c 100644
--- a/ipojo/tests/manipulator/primitives/pom.xml
+++ b/ipojo/tests/manipulator/primitives/pom.xml
@@ -29,7 +29,7 @@
   <name>iPOJO Primitive Manipulation Test Suite</name>
   <artifactId>tests.manipulation.primitives</artifactId>
   <groupId>ipojo.tests</groupId>
-  <version>${ipojo.core.snapshot}</version>
+  <version>${ipojo.manipulator.snapshot}</version>
   <dependencies>
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-ipojo-plugin</artifactId>
-        <version>${ipojo.core.snapshot}</version>
+        <version>${ipojo.manipulator.snapshot}</version>
         <executions>
           <execution>
             <goals>
diff --git a/ipojo/tests/pom.xml b/ipojo/tests/pom.xml
index e57392d..c7d753f 100644
--- a/ipojo/tests/pom.xml
+++ b/ipojo/tests/pom.xml
@@ -38,19 +38,22 @@
 
 
   <properties>
-    <ipojo.core.release>1.8.0</ipojo.core.release>
+    <ipojo.core.release>1.8.2</ipojo.core.release>
     <ipojo.core.snapshot>1.9.0-SNAPSHOT</ipojo.core.snapshot>
 
     <ipojo.api.release>1.6.0</ipojo.api.release>
     <ipojo.api.snapshot>1.7.0-SNAPSHOT</ipojo.api.snapshot>
 
-    <ipojo.composite.release>1.8.0</ipojo.composite.release>
+    <ipojo.composite.release>1.8.2</ipojo.composite.release>
     <ipojo.composite.snapshot>1.9.0-SNAPSHOT</ipojo.composite.snapshot>
 
     <ipojo.eah.release>1.6.0</ipojo.eah.release>
     <ipojo.eah.snapshot>1.9.0-SNAPSHOT</ipojo.eah.snapshot>
     <ipojo.temporal.snapshot>1.7.0-SNAPSHOT</ipojo.temporal.snapshot>
     <ipojo.wbp.snapshot>1.6.1-SNAPSHOT</ipojo.wbp.snapshot>
+
+    <ipojo.manipulator.release>1.8.6</ipojo.manipulator.release>
+    <ipojo.manipulator.snapshot>1.9.0-SNAPSHOT</ipojo.manipulator.snapshot>
   </properties>
 
   <dependencyManagement>
@@ -156,7 +159,7 @@
               <plugin>
                   <groupId>org.apache.felix</groupId>
                   <artifactId>maven-ipojo-plugin</artifactId>
-                  <version>1.9.0-SNAPSHOT</version>
+                  <version>${ipojo.manipulator.snapshot}</version>
               </plugin>
               <plugin>
                   <groupId>org.apache.felix</groupId>