diff --git a/base/build.gradle b/base/build.gradle
index 3e91ff6fd..84e3ab450 100644
--- a/base/build.gradle
+++ b/base/build.gradle
@@ -55,27 +55,25 @@ test {
 	useJUnitPlatform()
 }
 
-task testAllJavaVersions() { testAllTask ->
-	dependsOn(test) // the usual test runs on Java 8
+def testAllJavaVersions = tasks.register("testAllJavaVersions") { dependsOn(test) }
 
-	javaVersionsForTest.each {version ->
+javaVersionsForTest.each {version ->
 
-		task("testJava$version", type: Test) {
+	def testVersion = tasks.register("testJava$version",Test) {
+		// The version of bytebuddy used by mockk only supports Java 20 experimentally so far
+		if (version == 20) systemProperty 'net.bytebuddy.experimental', true
 
-			// The version of bytebuddy used by mockk only supports Java 20 experimentally so far
-			if (version == 20) systemProperty 'net.bytebuddy.experimental', true
+		useJUnitPlatform()
 
-			useJUnitPlatform()
 
-			testAllTask.dependsOn(it)
-
-			javaLauncher = javaToolchains.launcherFor {
-				languageVersion = JavaLanguageVersion.of(version)
-			}
+		javaLauncher = javaToolchains.launcherFor {
+			languageVersion = JavaLanguageVersion.of(version)
 		}
 	}
+	testAllJavaVersions.configure { dependsOn(testVersion) }
 }
 
+
 jacocoTestReport {
 	// Define which classes need to be monitored
 	def sources = files(sourceSets.main.allSource.srcDirs)
diff --git a/build.gradle b/build.gradle
index d8898672a..38256e282 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,6 @@
 import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
 	id 'distribution'
@@ -51,7 +53,7 @@ allprojects {
 		}
 	}
 
-	tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+	tasks.withType(KotlinCompile).configureEach {
 		kotlinOptions {
 			jvmTarget = '1.8'
 			freeCompilerArgs = [
@@ -59,7 +61,7 @@ allprojects {
 			]
 		}
 	}
-	tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompilationTask.class)
+	tasks.withType(KotlinCompilationTask.class)
 			.configureEach {
 				compilerOptions.languageVersion = KotlinVersion.KOTLIN_1_7
 			}
@@ -89,7 +91,7 @@ javadoc {
 	options.addStringOption('Xdoclint:none', '-quiet')
 }
 
-task buildDocumentation(type: Exec) {
+def buildDocumentation = tasks.register("buildDocumentation", Exec) {
 	dependsOn javadoc
 	inputs.dir 'docs/md'
 	inputs.file 'docs/mkdocs.yml'