diff --git a/images/linux/scripts/installers/java-tools.sh b/images/linux/scripts/installers/java-tools.sh
index 3a75ef25f..a5df5182d 100644
--- a/images/linux/scripts/installers/java-tools.sh
+++ b/images/linux/scripts/installers/java-tools.sh
@@ -83,7 +83,7 @@ curl -sL $gradleUrl -o gradleLatest.zip
 unzip -qq -d /usr/share gradleLatest.zip
 rm gradleLatest.zip
 ln -s /usr/share/gradle-"${gradleVersion}"/bin/gradle /usr/bin/gradle
-echo "GRADLE_HOME=/usr/share/gradle" | tee -a /etc/environment
+echo "GRADLE_HOME=$(find /usr/share -depth -maxdepth 1 -name "gradle*")" | tee -a /etc/environment
 
 reloadEtcEnvironment
 invoke_tests "Java"
diff --git a/images/linux/scripts/tests/Java.Tests.ps1 b/images/linux/scripts/tests/Java.Tests.ps1
index 177fafd15..68caf17cb 100644
--- a/images/linux/scripts/tests/Java.Tests.ps1
+++ b/images/linux/scripts/tests/Java.Tests.ps1
@@ -18,11 +18,21 @@ Describe "Java" {
         @{ ToolName = "javac" }
         @{ ToolName = "mvn" }
         @{ ToolName = "ant" }
-        @{ ToolName = "gradle" }
     ) {
         "$ToolName -version" | Should -ReturnZeroExitCode
     }
 
+    It "Gradle" {
+        "gradle -version" | Should -ReturnZeroExitCode
+
+        $gradleVariableValue = Get-EnvironmentVariable "GRADLE_HOME"
+        $gradleVariableValue | Should -BeLike "/usr/share/gradle-*"
+
+        $gradlePath = Join-Path $env:GRADLE_HOME "bin/gradle"
+        $result = Get-CommandResult "`"$GradlePath`" -version"
+        $result.ExitCode | Should -Be 0
+    }
+
     It "Java <Version>" -TestCases $jdkVersions {
         $javaVariableValue = Get-EnvironmentVariable "JAVA_HOME_${Version}_X64"
         $javaVariableValue | Should -Not -BeNullOrEmpty