3.1 merge
diff --git a/org.eclipse.mylyn.monitor.tests/.classpath b/org.eclipse.mylyn.monitor.tests/.classpath
index 6f1aa2c..a5424b2 100644
--- a/org.eclipse.mylyn.monitor.tests/.classpath
+++ b/org.eclipse.mylyn.monitor.tests/.classpath
@@ -6,6 +6,6 @@
 			<accessrule kind="accessible" pattern="**/internal/**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.mylyn.monitor.ui/.classpath b/org.eclipse.mylyn.monitor.ui/.classpath
index 743397d..ce847c5 100644
--- a/org.eclipse.mylyn.monitor.ui/.classpath
+++ b/org.eclipse.mylyn.monitor.ui/.classpath
@@ -8,6 +8,6 @@
 	</classpathentry>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-httpclient-3.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>