diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 5934e8d64cdf..0b7b1b14b125 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -208,6 +208,15 @@ processTestResources {
 	}
 }
 
+// Enable the experimental features of ByteBuddy with JDK 15+
+test {
+	if ( Integer.valueOf( gradle.ext.testedJavaVersionAsEnum.getMajorVersion() ) >= 15 ) {
+		logger.warn( "The version of java that will be tested is not supported by Bytebuddy by default. " +
+				 " Setting 'net.bytebuddy.experimental=true'." )
+		systemProperty 'net.bytebuddy.experimental', true
+	}
+}
+
 test {
 	if ( project.findProperty( 'log-test-progress' )?.toString()?.toBoolean() ) {
 		// Log a statement for each test.