diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
index 4f3d1d7c8f..b3b4693b72 100644
--- a/lib-extra/build.gradle
+++ b/lib-extra/build.gradle
@@ -38,10 +38,8 @@ spotless {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// needed for EclipseCdtFormatterStepTest
-		jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
-	}
+	// needed for EclipseCdtFormatterStepTest
+	jvmArgs '--add-opens=java.base/java.lang=ALL-UNNAMED'
 }
 
 def NEEDS_P2_DEPS = [
@@ -50,9 +48,6 @@ def NEEDS_P2_DEPS = [
 	'groovy',
 	'jdt'
 ]
-if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
-	NEEDS_P2_DEPS.remove('cdt')
-}
 for (needsP2 in NEEDS_P2_DEPS) {
 	sourceSets.register(needsP2) {
 		compileClasspath += sourceSets.main.output
diff --git a/lib/build.gradle b/lib/build.gradle
index e5262fb545..8ed13cd1c3 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -131,15 +131,9 @@ spotbugs {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// https://docs.gradle.org/7.5/userguide/upgrading_version_7.html#removes_implicit_add_opens_for_test_workers
-		jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
-	}
+	jvmArgs "--add-opens=java.base/java.lang=ALL-UNNAMED"
 
-	if (GradleVersion.current() >= GradleVersion.version('9.0')) {
-		// https://github.com/gradle/gradle/issues/33619
-		failOnNoDiscoveredTests = false
-	}
+	failOnNoDiscoveredTests = false
 }
 
 jar {
diff --git a/testlib/build.gradle b/testlib/build.gradle
index efea285f8d..5e8a8be3e5 100644
--- a/testlib/build.gradle
+++ b/testlib/build.gradle
@@ -31,14 +31,11 @@ spotbugs {
 
 apply from: rootProject.file('gradle/special-tests.gradle')
 tasks.withType(Test).configureEach {
-	if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
-		// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
-		def args = [
+	// for Antlr4FormatterStepTest, KtfmtStepTest, and KtLintStepTest
+	jvmArgs(
 			'--add-opens=java.base/java.lang=ALL-UNNAMED',
 			'--add-opens=java.base/java.util=ALL-UNNAMED',
-		]
-		jvmArgs args
-	}
+			)
 }
 
 javadoc {