diff --git a/gradle/java-module.gradle b/gradle/java-module.gradle
index 481669cdf2..0dff3a1255 100644
--- a/gradle/java-module.gradle
+++ b/gradle/java-module.gradle
@@ -229,7 +229,7 @@ if ( gradle.ext.javaToolchainEnabled ) {
 		}
 
 		// Configure JVM Options
-		jvmArgs.addAll( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) )
+		jvmArgs( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) )
 
 		// Display version of Java tools
 		doFirst {
diff --git a/hibernate-core/hibernate-core.gradle b/hibernate-core/hibernate-core.gradle
index d2dacf89a8..dc93805bf6 100644
--- a/hibernate-core/hibernate-core.gradle
+++ b/hibernate-core/hibernate-core.gradle
@@ -282,7 +282,7 @@ task testJavassist(type: Test) {
         }
 
         //  Configure JVM Options
-        jvmArgs.addAll( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) )
+        jvmArgs( getProperty( 'toolchain.launcher.jvmargs' ).toString().split( ' ' ) )
 
         // Display version of Java tools
         doFirst {