diff --git a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle01/plugin.xml b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle01/plugin.xml
index f13334a6711..58c01fd4fb9 100644
--- a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle01/plugin.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle01/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-	<extension point="org.eclipse.core.runtime.contentTypes">
+	<extension point="org.eclipse.core.contenttype.contentTypes">
 		<content-type id="missing" name="Missing"/>
 	</extension>	
 </plugin>
diff --git a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle02/plugin.xml b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle02/plugin.xml
index 2212d65fe2f..4b1273746a7 100644
--- a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle02/plugin.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle02/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-	<extension point="org.eclipse.core.runtime.contentTypes">
+	<extension point="org.eclipse.core.contenttype.contentTypes">
 		<content-type id="missing-target" name="Missing alias target"
 		file-extensions="missing-target"/>		
 	</extension>	
diff --git a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle03/plugin.xml b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle03/plugin.xml
index 7b18f4212db..2463d8a3ed1 100644
--- a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle03/plugin.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle03/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-      <extension point="org.eclipse.core.runtime.contentTypes">
+      <extension point="org.eclipse.core.contenttype.contentTypes">
       <!-- this content type has an invalid describer, it should never be picked on content-based content type lookup -->
       <content-type
             name="Invalid Describer"
diff --git a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle04/plugin.xml b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle04/plugin.xml
index 94a2d551b51..1a175ecdcac 100644
--- a/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle04/plugin.xml
+++ b/resources/tests/org.eclipse.core.tests.resources/Plugin_Testing/content/bundle04/plugin.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <plugin>
-	<extension point="org.eclipse.core.runtime.contentTypes">
+	<extension point="org.eclipse.core.contenttype.contentTypes">
 		<content-type id="empty_extension1" name="Empty Extension 1" file-extensions=""/>	
 		<content-type id="empty_extension2" name="Empty Extension 2" file-extensions="foo,"/>
 		<content-type id="empty_extension3" name="Empty Extension 3" file-extensions=",foo"/>
diff --git a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java
index aa1222a93bb..fefc3870a51 100644
--- a/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java
+++ b/resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/IContentTypeManagerTest.java
@@ -204,7 +204,7 @@ public void testAlias() throws Exception {
 		assertThat(selected).containsExactly(alias, derived);
 
 		// test late addition of content type
-		TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
+		TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
 				ContentTypeBuilder.PT_CONTENTTYPES, null, null);
 		BundleTestingHelper.runWithBundles(() -> {
 			IContentType alias1 = contentTypeManager.getContentType(PI_RESOURCES_TESTS + ".alias");
@@ -761,7 +761,7 @@ public void testDynamicChanges() throws Exception {
 		assertEquals(text[0], text[1]);
 		assertEquals(text[0], text[1]);
 		// make arbitrary dynamic changes to the contentTypes extension point
-		TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
+		TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
 				ContentTypeBuilder.PT_CONTENTTYPES, null, null);
 		BundleTestingHelper.runWithBundles(() -> {
 			IContentType missing = manager.getContentType("org.eclipse.bundle01.missing");
@@ -1031,7 +1031,7 @@ public void testInvalidMarkup() throws Exception {
 		assertThat(finder.findContentTypesFor("invalid.missing.identifier")).isEmpty();
 		assertThat(finder.findContentTypesFor("invalid.missing.name")).isEmpty();
 		assertNull(contentTypeManager.getContentType(PI_RESOURCES_TESTS + '.' + "invalid-missing-name"));
-		TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
+		TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
 				ContentTypeBuilder.PT_CONTENTTYPES, null, null);
 		BundleTestingHelper.runWithBundles(() -> {
 			// ensure the invalid content types are not available
@@ -1173,7 +1173,7 @@ public void testNoExtensionAssociation() throws Exception {
 		IContentType[] selected = manager.findContentTypesFor("file_with_no_extension");
 		assertThat(selected).isEmpty();
 
-		TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
+		TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
 				ContentTypeBuilder.PT_CONTENTTYPES, null, null);
 		BundleTestingHelper.runWithBundles(() -> {
 			final String namespace = "org.eclipse.bundle04";
@@ -1240,7 +1240,7 @@ public void testOrphanContentType() throws Exception {
 		assertThat(contentTypeManager.findContentTypesFor("foo.orphan2")).isEmpty();
 
 		// test late addition of content type - orphan2 should become visible
-		TestRegistryChangeListener listener = new TestRegistryChangeListener(Platform.PI_RUNTIME,
+		TestRegistryChangeListener listener = new TestRegistryChangeListener(IContentConstants.CONTENT_NAME,
 				ContentTypeBuilder.PT_CONTENTTYPES, null, null);
 
 		BundleTestingHelper.runWithBundles(() -> {