diff --git a/ci/build.sh b/ci/build.sh
index c22f440400..019f6dbf08 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -82,7 +82,7 @@ fi
 # so that CI jobs give a more complete report
 # and developers can fix code style and non-H2 DB tests in parallel.
 if [ -n "$goal" ]; then
-  goal="$goal -x checkstyleMain"
+  goal="$goal -x checkstyleMain -DPOPULATE_REMOTE=true"
 fi
 
 function logAndExec() {
diff --git a/gradle/gradle-develocity.gradle b/gradle/gradle-develocity.gradle
index 25660c40d2..26422d7671 100644
--- a/gradle/gradle-develocity.gradle
+++ b/gradle/gradle-develocity.gradle
@@ -11,7 +11,7 @@
 
 ext {
     isCiEnvironment = isJenkins() || isGitHubActions() || isGenericCi()
-    populateRemoteBuildCache = getSetting( "POPULATE_REMOTE_GRADLE_CACHE" ).isPresent()
+    populateRemoteBuildCache = isEnabled( "POPULATE_REMOTE_GRADLE_CACHE" )
 }
 
 private static boolean isJenkins() {
@@ -36,6 +36,14 @@ static java.util.Optional<String> getSetting(String name) {
     return java.util.Optional.ofNullable(sysProp);
 }
 
+static boolean isEnabled(String setting) {
+	if ( System.getenv().hasProperty( setting ) ) {
+		return true
+	}
+
+	return System.hasProperty( setting )
+}
+
 develocity {
     server = 'https://ge.hibernate.org'