diff --git a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
index cef457221..f9af09e06 100644
--- a/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
+++ b/headless-services/commons/commons-gradle/src/main/java/org/springframework/ide/vscode/commons/gradle/GradleCore.java
@@ -76,8 +76,8 @@ public class GradleCore {
 			 */
 			((DefaultGradleConnector) gradleConnector).daemonMaxIdleTime(1, TimeUnit.SECONDS);
 			configuration.configure(gradleConnector);
-			// Use patched Gradle 4.3 distribution as a workaround for https://github.com/gradle/gradle/issues/2483
-			gradleConnector.useDistribution(URI.create("http://s3-test.spring.io/sts4/custom-gradle-builds/gradle-4.3-build.zip"));
+			// Use patched Gradle 4.4 distribution or higher as a workaround for https://github.com/gradle/gradle/issues/2483
+			gradleConnector.useGradleVersion("4.6");
 			connection = gradleConnector.connect();
 			return connection.getModel(modelType);
 		} catch (GradleConnectionException e) {
diff --git a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
index 8e58dc89e..7def43ca1 100644
--- a/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
+++ b/headless-services/commons/commons-gradle/src/test/java/org/springframework/ide/vscode/commons/gradle/GradleProjectTest.java
@@ -83,7 +83,7 @@ public class GradleProjectTest {
 	@Test
 	public void outputFolder() throws Exception {
 		GradleJavaProject project = getGradleProject("test-app-1");
-		assertTrue(project.getClasspath().getOutputFolder().endsWith("bin"));
+		assertTrue(project.getClasspath().getOutputFolder().toString().contains("/bin"));
 	}
 	
 	@Test