diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project
deleted file mode 100644
index e69e63bee79..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.sdk.tests (feature)</name>
-	<comment></comment>
-	<projects>
-	</projects>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.pde.FeatureBuilder</name>
-      <arguments>
-      </arguments>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.pde.FeatureNature</nature>
-  </natures>
-</projectDescription>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0203a..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d2a7..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties b/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties
deleted file mode 100644
index 6230b466620..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2021 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-							 feature.properties					
-
-! https://bugs.eclipse.org/bugs/show_bug.cgi?id=458885
-! If there are no root files, you do *not* want to say there is. 
-! or, build will break.
-!root=rootfiles
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties
deleted file mode 100644
index 16e368696f8..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse SDK Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
-
-# "description" property - description of the feature
-description=Eclipse SDK test plug-ins. Used in conjunction with Eclipse Project SDK.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2021 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
deleted file mode 100644
index d1d1dbf6e54..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ /dev/null
@@ -1,398 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.sdk.tests"
-      label="%featureName"
-      version="4.40.0.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.test"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.sdk.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ant.tests.core"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ant.tests.ui"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.compare.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.harness"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.osgi.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.runtime"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.resources"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.resources.saveparticipant"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.resources.saveparticipant1"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.resources.saveparticipant2"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.resources.saveparticipant3"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.tests.net"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.core.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.core.commands.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.bindings.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.tests.css.core"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.tests.css.swt"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.e4.ui.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.ds.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.compiler.apt.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.apt.pluggable.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.builder"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.compiler"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.model"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.compiler.tool.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.performance"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.builder.mockcompiler"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.debug.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.debug.jdi.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.ui.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.ui.tests.refactoring"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.text.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.expressions.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ltk.core.refactoring.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ltk.ui.refactoring.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.text.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jface.text.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.filebuffers.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.debug.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.workbench.texteditor.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.editors.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.search.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.text.quicksearch.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.swt.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jface.tests.databinding"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jface.tests.databinding.conformance"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jface.examples.databinding"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tips.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ua.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ua.tests.doc"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.navigator"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.rcp"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.forms"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.genericeditor.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.ua.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.ui.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.ui.templates.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.genericeditor.extension.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.build.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.ds.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.releng.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.team.tests.core"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.harness"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.performance"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.views.properties.tabbed"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.api.tools.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.security.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.preferences.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.http.servlet.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.apache.commons.commons-fileupload"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.installer"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.tests.discovery"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.tests.ui"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.p2.tests.verifier"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.frameworkadmin.test"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.tests.binaries"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.bidi.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.mockito.mockito-core"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.objenesis"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.ui.tests.pluginchecks"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tests.urischeme"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.equinox.common.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.jface.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.pde.junit.runtime.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.core.contenttype.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.update.configurator.tests"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.swt.svg"
-         version="0.0.0"/>
-
-   <plugin
-         id="com.github.weisj.jsvg"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.terminal.test"
-         version="0.0.0"/>
-
-</feature>
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt b/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt
deleted file mode 100644
index c180b3aa000..00000000000
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
-
-# added third party bundle so need to force update in qualifier. 
-Bug 407833 - equinox can/should express it's own need for org.aspectj.weaver
-Bug 405911 - 3 p2 bundles don't produce (or, package) their .source
-Bug 463632 - [releng] Version of 'weaver' is old, in Platform builds? 
-Bug 467268 - Update to Orbit RC1 URL
-Bug 468331 - Update EGit/JGit compile-time dependencies to Mars level
-Bug 480835 - Failures in build due to changes not being picked up by tests
-Bug 566156 - 4.17 I-Build: I20200818-0600 - BUILD FAILED
-4.20 I-Build: I20210518-0600 - BUILD FAILED
-Bug 577522 - Update test framework dependencies
-Failed https://ci.eclipse.org/releng/job/Builds/job/I-build-4.36/61/consoleFull
-Failed https://ci.eclipse.org/releng/job/Builds/job/I-build-4.37/14/
\ No newline at end of file
diff --git a/sites/eclipse-junit-tests/category.xml b/sites/eclipse-junit-tests/category.xml
index c37ba6e0472..f19846ed04c 100644
--- a/sites/eclipse-junit-tests/category.xml
+++ b/sites/eclipse-junit-tests/category.xml
@@ -1,10 +1,102 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature id="org.eclipse.sdk.tests"/>
    <feature id="org.eclipse.test"/>
    <bundle id="junit-jupiter-api"/>
    <bundle id="org.junit"/>
    <bundle id="assertj-core"/>
    <bundle id="net.bytebuddy.byte-buddy"/>
    <bundle id="net.bytebuddy.byte-buddy-agent"/>
+   <bundle id="org.eclipse.sdk.tests"/>
+   <bundle id="org.eclipse.ant.tests.core"/>
+   <bundle id="org.eclipse.ant.tests.ui"/>
+   <bundle id="org.eclipse.compare.tests"/>
+   <bundle id="org.eclipse.core.tests.harness"/>
+   <bundle id="org.eclipse.osgi.tests"/>
+   <bundle id="org.eclipse.core.tests.runtime"/>
+   <bundle id="org.eclipse.core.tests.resources"/>
+   <bundle id="org.eclipse.core.tests.resources.saveparticipant"/>
+   <bundle id="org.eclipse.core.tests.resources.saveparticipant1"/>
+   <bundle id="org.eclipse.core.tests.resources.saveparticipant2"/>
+   <bundle id="org.eclipse.core.tests.resources.saveparticipant3"/>
+   <bundle id="org.eclipse.core.tests.net"/>
+   <bundle id="org.eclipse.e4.core.tests"/>
+   <bundle id="org.eclipse.e4.core.commands.tests"/>
+   <bundle id="org.eclipse.e4.ui.bindings.tests"/>
+   <bundle id="org.eclipse.e4.ui.tests.css.core"/>
+   <bundle id="org.eclipse.e4.ui.tests.css.swt"/>
+   <bundle id="org.eclipse.e4.ui.tests"/>
+   <bundle id="org.eclipse.equinox.ds.tests"/>
+   <bundle id="org.eclipse.jdt.apt.tests"/>
+   <bundle id="org.eclipse.jdt.compiler.apt.tests"/>
+   <bundle id="org.eclipse.jdt.apt.pluggable.tests"/>
+   <bundle id="org.eclipse.jdt.core.tests.builder"/>
+   <bundle id="org.eclipse.jdt.core.tests.compiler"/>
+   <bundle id="org.eclipse.jdt.core.tests.model"/>
+   <bundle id="org.eclipse.jdt.compiler.tool.tests"/>
+   <bundle id="org.eclipse.jdt.core.tests.performance"/>
+   <bundle id="org.eclipse.jdt.core.tests.builder.mockcompiler"/>
+   <bundle id="org.eclipse.jdt.debug.tests"/>
+   <bundle id="org.eclipse.jdt.debug.jdi.tests"/>
+   <bundle id="org.eclipse.jdt.ui.tests"/>
+   <bundle id="org.eclipse.jdt.ui.tests.refactoring"/>
+   <bundle id="org.eclipse.jdt.text.tests"/>
+   <bundle id="org.eclipse.core.expressions.tests"/>
+   <bundle id="org.eclipse.ltk.core.refactoring.tests"/>
+   <bundle id="org.eclipse.ltk.ui.refactoring.tests"/>
+   <bundle id="org.eclipse.text.tests"/>
+   <bundle id="org.eclipse.jface.text.tests"/>
+   <bundle id="org.eclipse.core.filebuffers.tests"/>
+   <bundle id="org.eclipse.debug.tests"/>
+   <bundle id="org.eclipse.ui.workbench.texteditor.tests"/>
+   <bundle id="org.eclipse.ui.editors.tests"/>
+   <bundle id="org.eclipse.search.tests"/>
+   <bundle id="org.eclipse.text.quicksearch.tests"/>
+   <bundle id="org.eclipse.swt.tests"/>
+   <bundle id="org.eclipse.jface.tests.databinding"/>
+   <bundle id="org.eclipse.jface.tests.databinding.conformance"/>
+   <bundle id="org.eclipse.jface.examples.databinding"/>
+   <bundle id="org.eclipse.ui.tests"/>
+   <bundle id="org.eclipse.tips.tests"/>
+   <bundle id="org.eclipse.ua.tests"/>
+   <bundle id="org.eclipse.ua.tests.doc"/>
+   <bundle id="org.eclipse.ui.tests.navigator"/>
+   <bundle id="org.eclipse.ui.tests.rcp"/>
+   <bundle id="org.eclipse.ui.tests.forms"/>
+   <bundle id="org.eclipse.ui.genericeditor.tests"/>
+   <bundle id="org.eclipse.pde.ua.tests"/>
+   <bundle id="org.eclipse.pde.ui.tests"/>
+   <bundle id="org.eclipse.pde.ui.templates.tests"/>
+   <bundle id="org.eclipse.pde.genericeditor.extension.tests"/>
+   <bundle id="org.eclipse.pde.build.tests"/>
+   <bundle id="org.eclipse.pde.ds.tests"/>
+   <bundle id="org.eclipse.releng.tests"/>
+   <bundle id="org.eclipse.team.tests.core"/>
+   <bundle id="org.eclipse.ui.tests.harness"/>
+   <bundle id="org.eclipse.ui.tests.performance"/>
+   <bundle id="org.eclipse.ui.tests.views.properties.tabbed"/>
+   <bundle id="org.eclipse.pde.api.tools.tests"/>
+   <bundle id="org.eclipse.equinox.security.tests"/>
+   <bundle id="org.eclipse.equinox.preferences.tests"/>
+   <bundle id="org.eclipse.equinox.http.servlet.tests"/>
+   <bundle id="org.apache.commons.commons-fileupload"/>
+   <bundle id="org.eclipse.equinox.p2.installer"/>
+   <bundle id="org.eclipse.equinox.p2.tests"/>
+   <bundle id="org.eclipse.equinox.p2.tests.discovery"/>
+   <bundle id="org.eclipse.equinox.p2.tests.ui"/>
+   <bundle id="org.eclipse.equinox.p2.tests.verifier"/>
+   <bundle id="org.eclipse.equinox.frameworkadmin.test"/>
+   <bundle id="org.eclipse.jdt.core.tests.binaries"/>
+   <bundle id="org.eclipse.equinox.bidi.tests"/>
+   <bundle id="org.mockito.mockito-core"/>
+   <bundle id="org.objenesis"/>
+   <bundle id="org.eclipse.ui.tests.pluginchecks"/>
+   <bundle id="org.eclipse.tests.urischeme"/>
+   <bundle id="org.eclipse.equinox.common.tests"/>
+   <bundle id="org.eclipse.jface.tests"/>
+   <bundle id="org.eclipse.pde.junit.runtime.tests"/>
+   <bundle id="org.eclipse.core.contenttype.tests"/>
+   <bundle id="org.eclipse.update.configurator.tests"/>
+   <bundle id="org.eclipse.swt.svg"/>
+   <bundle id="com.github.weisj.jsvg"/>
+   <bundle id="org.eclipse.terminal.test"/>
 </site>