diff --git a/build.versions b/build.versions
index b80a409..a9b0ee8 100644
--- a/build.versions
+++ b/build.versions
@@ -1,10 +1,10 @@
 # Compile
 org.eclipse.osgi=3.8.0.v20120508-2119
-org.eclipse.virgo.osgi=3.5.0.D-20120703100719
-org.eclipse.virgo.util=3.5.0.D-20120703101157
+org.eclipse.virgo.osgi=3.6.0.D-20120711092707
+org.eclipse.virgo.util=3.6.0.D-20120711093140
 
 # Test
 org.junit=4.7.0
-org.eclipse.virgo.teststubs=3.5.0.D-20120703100228
+org.eclipse.virgo.teststubs=3.6.0.D-20120711092322
 
 
diff --git a/org.eclipse.virgo.test.framework/.classpath b/org.eclipse.virgo.test.framework/.classpath
index fb3c9d1..3db16fe 100644
--- a/org.eclipse.virgo.test.framework/.classpath
+++ b/org.eclipse.virgo.test.framework/.classpath
@@ -7,10 +7,10 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
-	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120703100719.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.launcher-sources-3.5.0.D-20120703100719.jar"/>
-	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120703101157/org.eclipse.virgo.util.common-3.5.0.D-20120703101157.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.5.0.D-20120703101157/org.eclipse.virgo.util.common-sources-3.5.0.D-20120703101157.jar"/>
-	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120703100228/org.eclipse.virgo.teststubs.osgi-3.5.0.D-20120703100228.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.5.0.D-20120703100228/org.eclipse.virgo.teststubs.osgi-sources-3.5.0.D-20120703100228.jar"/>
+	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
+	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-3.6.0.D-20120711093140.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.util/org.eclipse.virgo.util.common/3.6.0.D-20120711093140/org.eclipse.virgo.util.common-sources-3.6.0.D-20120711093140.jar"/>
+	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-3.6.0.D-20120711092322.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.teststubs/org.eclipse.virgo.teststubs.osgi/3.6.0.D-20120711092322/org.eclipse.virgo.teststubs.osgi-sources-3.6.0.D-20120711092322.jar"/>
 	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.12.RELEASE/com.springsource.org.aspectj.runtime-1.6.12.RELEASE.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.aspectj/com.springsource.org.aspectj.runtime/1.6.6.RELEASE/com.springsource.org.aspectj.runtime-sources-1.6.6.RELEASE.jar"/>
-	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.extensions.equinox-3.5.0.D-20120703100719.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.extensions.equinox-sources-3.5.0.D-20120703100719.jar"/>
+	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.extensions.equinox/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.extensions.equinox-sources-3.6.0.D-20120711092707.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.eclipse.virgo.test.test/.classpath b/org.eclipse.virgo.test.test/.classpath
index ab99c3f..736ea61 100644
--- a/org.eclipse.virgo.test.test/.classpath
+++ b/org.eclipse.virgo.test.test/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-4.7.0.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.junit/com.springsource.org.junit/4.7.0/com.springsource.org.junit-sources-4.7.0.jar"/>
 	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.mirrored/org.eclipse.osgi/3.8.0.v20120508-2119/org.eclipse.osgi-3.8.0.v20120508-2119.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.osgi/org.eclipse.osgi/3.7.1.R37x_v20110808-1106/org.eclipse.osgi-sources-3.7.1.R37x_v20110808-1106.jar"/>
-	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.launcher-3.5.0.D-20120703100719.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.5.0.D-20120703100719/org.eclipse.virgo.osgi.launcher-sources-3.5.0.D-20120703100719.jar"/>
+	<classpathentry kind="var" path="TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-3.6.0.D-20120711092707.jar" sourcepath="/TEST_FRAMEWORK_IVY_CACHE/org.eclipse.virgo.osgi/org.eclipse.virgo.osgi.launcher/3.6.0.D-20120711092707/org.eclipse.virgo.osgi.launcher-sources-3.6.0.D-20120711092707.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.virgo.test.framework"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>