diff --git a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
index 0bfab7f..18f5f65 100644
--- a/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.core.tests.harness/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@
 Require-Bundle: org.eclipse.core.runtime.compatibility,
  org.junit,
  org.eclipse.pde.junit.runtime,
- org.eclipse.test.performance
+ org.eclipse.test.performance;resolution:=optional
 Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/IContentTypeManagerTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/IContentTypeManagerTest.java
index c7f5ab4..da13b8d 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/IContentTypeManagerTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/IContentTypeManagerTest.java
@@ -696,7 +696,6 @@
 		}
 		assertTrue("6.1", !tracer.isOnlyChange(myType));
 		
-		// XXX Oleg: reset type for the next text run (if type to set == current type, no event will be generated)
 		try {
 			myType.setDefaultCharset("ABC");
 		} catch (CoreException e1) {
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/SpecificContextTest.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/SpecificContextTest.java
index 58de485..7c30dd5 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/SpecificContextTest.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/content/SpecificContextTest.java
@@ -80,7 +80,6 @@
 		assertEquals("2.0", textContentType, local.findContentTypeFor(getName() + ".local"));
 		assertEquals("2.1", null, global.findContentTypeFor(getName() + ".local"));
 		
-		// XXX Oleg: clean-up for the follow-up tests
 		try {
 			textContentType.removeFileSpec(getName() + ".global", IContentType.FILE_NAME_SPEC);
 		} catch (CoreException e) {