diff --git a/eclipse.yaml b/eclipse.yaml
index e71509b..2ea2e5b 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -79,7 +79,6 @@ data:
                 - eclipse-remote
                 - eclipse-subclipse
                 - eclipse-swt
-                - eclipse-testng
                 - eclipse-tm-terminal
                 - eclipse-tm-terminal-connectors
                 - eclipse-usage
@@ -187,7 +186,6 @@ data:
             - eclipse-remote
             - eclipse-subclipse
             - eclipse-swt
-            - eclipse-testng
             - eclipse-tm-terminal
             - eclipse-tm-terminal-connectors
             - eclipse-usage
@@ -203,7 +201,6 @@ data:
                 %_without_javahl 1
                 %_without_spring 1
                 %_without_mylyn_epub 1
-                %_without_contrib_tools 1
                 %_without_tests 1
                 %_without_reflections 1
                 %_without_okcurl 1
@@ -274,12 +271,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of snakeyaml.
-            beust-jcommander:
-                buildorder: 10
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of testng.
             batik:
                 buildorder: 20
                 ref: eclipse
@@ -385,7 +376,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-testng.
             eclipse-m2e-workspace:
                 buildorder: 40
                 ref: eclipse
@@ -425,12 +415,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-            eclipse-testng:
-                buildorder: 70
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Module API.
             eclipse-tm-terminal:
                 buildorder: 60
                 ref: eclipse
@@ -554,7 +538,7 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse, eclipse-cdt, eclipse-egit-github, jgit,
-                         eclipse-m2e-core, eclipse-mylyn, eclipse-testng, eclipse-webtools, testng-remote.
+                         eclipse-m2e-core, eclipse-mylyn, eclipse-webtools.
             icu4j:
                 buildorder: 10
                 ref: eclipse
@@ -858,7 +842,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
-                    Runtime dependency of eclipse-pydev, eclipse-testng, testng.
+                    Runtime dependency of eclipse-pydev.
             sqljet:
                 buildorder: 30
                 ref: eclipse
@@ -883,18 +867,6 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-linuxtools.
-            testng:
-                buildorder: 30
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-testng, testng-remote.
-            testng-remote:
-                buildorder: 40
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of eclipse-testng.
             trilead-ssh2:
                 buildorder: 10
                 ref: eclipse