diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
index 2909c4bf1a..040107ea45 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporter.java
@@ -18,12 +18,12 @@
 import java.io.FilenameFilter;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.buildship.core.BuildConfiguration;
 import org.eclipse.buildship.core.GradleCore;
 import org.eclipse.buildship.core.GradleDistribution;
@@ -44,6 +44,7 @@
 import org.eclipse.jdt.ls.core.internal.JavaLanguageServerPlugin;
 import org.eclipse.jdt.ls.core.internal.ProjectUtils;
 import org.eclipse.jdt.ls.core.internal.preferences.PreferenceManager;
+import org.eclipse.jdt.ls.core.internal.preferences.Preferences;
 import org.eclipse.jdt.ls.internal.gradle.checksums.ValidationResult;
 import org.eclipse.jdt.ls.internal.gradle.checksums.WrapperValidator;
 import org.eclipse.lsp4j.ExecuteCommandParams;
@@ -54,6 +55,7 @@
  * @author Fred Bricon
  *
  */
+@SuppressWarnings("restriction")
 public class GradleProjectImporter extends AbstractProjectImporter {
 
 	public static final String GRADLE_HOME = "GRADLE_HOME";
@@ -87,14 +89,15 @@ public boolean applies(IProgressMonitor monitor) throws CoreException {
 		if (rootFolder == null) {
 			return false;
 		}
-		PreferenceManager preferencesManager = JavaLanguageServerPlugin.getPreferencesManager();
-		if (preferencesManager != null && !preferencesManager.getPreferences().isImportGradleEnabled()) {
+		Preferences preferences = getPreferences();
+		if (!preferences.isImportGradleEnabled()) {
 			return false;
 		}
 		if (directories == null) {
 			BasicFileDetector gradleDetector = new BasicFileDetector(rootFolder.toPath(), BUILD_GRADLE_DESCRIPTOR)
 					.includeNested(false)
-					.addExclusions("**/build");//default gradle build dir
+					.addExclusions("**/build")//default gradle build dir
+					.addExclusions("**/bin");
 			directories = gradleDetector.scan(monitor);
 		}
 		return !directories.isEmpty();
@@ -117,16 +120,18 @@ public void importToWorkspace(IProgressMonitor monitor) throws CoreException {
 		subMonitor.done();
 	}
 
-	private void importDir(Path rootFolder, IProgressMonitor monitor) {
+	private void importDir(Path projectFolder, IProgressMonitor monitor) {
 		if (monitor.isCanceled()) {
 			return;
 		}
-		startSynchronization(rootFolder, monitor);
+		startSynchronization(projectFolder, monitor);
 	}
 
+
 	public static GradleDistribution getGradleDistribution(Path rootFolder) {
 		PreferenceManager preferencesManager = JavaLanguageServerPlugin.getPreferencesManager();
-		if (preferencesManager != null && preferencesManager.getPreferences().isGradleWrapperEnabled() && Files.exists(rootFolder.resolve("gradlew"))) {
+		Preferences preferences = getPreferences();
+		if (preferencesManager != null && preferences.isGradleWrapperEnabled() && Files.exists(rootFolder.resolve("gradlew"))) {
 			WrapperValidator validator = new WrapperValidator();
 			try {
 				ValidationResult result = validator.checkWrapper(rootFolder.toFile().getAbsolutePath());
@@ -143,7 +148,8 @@ public static GradleDistribution getGradleDistribution(Path rootFolder) {
 								pm.getConnection().sendNotification(params);
 							} else {
 								//@formatter:off
-								String message = GRADLE_WRAPPER_CHEKSUM_WARNING_TEMPLATE.replaceAll("@wrapper@", result.getWrapperJar()).replaceAll("@checksum@", result.getChecksum());
+								String message = GRADLE_WRAPPER_CHEKSUM_WARNING_TEMPLATE.replaceAll("@wrapper@", result.getWrapperJar())
+																						.replaceAll("@checksum@", result.getChecksum());
 								//@formatter:on
 								pm.getConnection().showMessage(new MessageParams(MessageType.Error, message));
 							}
@@ -154,10 +160,10 @@ public static GradleDistribution getGradleDistribution(Path rootFolder) {
 				JavaLanguageServerPlugin.logException(e.getMessage(), e);
 			}
 		}
-		if (preferencesManager != null && preferencesManager.getPreferences().getGradleVersion() != null) {
+		if (StringUtils.isNotBlank(preferences.getGradleVersion())) {
 			List<GradleVersion> versions = CorePlugin.publishedGradleVersions().getVersions();
 			GradleVersion gradleVersion = null;
-			String versionString = preferencesManager.getPreferences().getGradleVersion();
+			String versionString = preferences.getGradleVersion();
 			GradleVersion requiredVersion = GradleVersion.version(versionString);
 			for (GradleVersion version : versions) {
 				if (version.compareTo(requiredVersion) == 0) {
@@ -184,8 +190,9 @@ public static File getGradleHomeFile() {
 	}
 
 	public static File getGradleHomeFile(Map<String, String> env, Properties sysprops) {
-		if (JavaLanguageServerPlugin.getPreferencesManager() != null && JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleHome() != null) {
-			return new File(JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleHome());
+		Preferences preferences = getPreferences();
+		if (StringUtils.isNotBlank(preferences.getGradleHome())) {
+			return new File(preferences.getGradleHome());
 		}
 		String gradleHome = env.get(GRADLE_HOME);
 		if (gradleHome == null || !new File(gradleHome).isDirectory()) {
@@ -201,9 +208,9 @@ public static File getGradleHomeFile(Map<String, String> env, Properties sysprop
 	}
 
 	public static File getGradleUserHomeFile() {
-		if (JavaLanguageServerPlugin.getPreferencesManager() != null && JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleUserHome() != null
-				&& !JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleUserHome().isEmpty()) {
-			return new File(JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleUserHome());
+		Preferences preferences = getPreferences();
+		if (StringUtils.isNotBlank(preferences.getGradleUserHome())) {
+			return new File(preferences.getGradleUserHome());
 		}
 		String gradleUserHome = System.getenv().get(GRADLE_USER_HOME);
 		if (gradleUserHome == null) {
@@ -212,19 +219,11 @@ public static File getGradleUserHomeFile() {
 		return (gradleUserHome == null || gradleUserHome.isEmpty()) ? null : new File(gradleUserHome);
 	}
 
-	protected void startSynchronization(Path rootFolder, IProgressMonitor monitor) {
-		File location = rootFolder.toFile();
+	protected void startSynchronization(Path projectFolder, IProgressMonitor monitor) {
+		File location = projectFolder.toFile();
 		boolean shouldSynchronize = shouldSynchronize(location);
-		List<IProject> projects = ProjectUtils.getGradleProjects();
-		for (IProject project : projects) {
-			File projectDir = project.getLocation() == null ? null : project.getLocation().toFile();
-			if (location.equals(projectDir)) {
-				shouldSynchronize = checkGradlePersistence(shouldSynchronize, project, projectDir);
-				break;
-			}
-		}
 		if (shouldSynchronize) {
-			BuildConfiguration build = getBuildConfiguration(rootFolder);
+			BuildConfiguration build = getBuildConfiguration(projectFolder);
 			SynchronizationResult result = GradleCore.getWorkspace().createBuild(build).synchronize(monitor);
 			if (!result.getStatus().isOK()) {
 				JavaLanguageServerPlugin.log(result.getStatus());
@@ -236,16 +235,17 @@ public static BuildConfiguration getBuildConfiguration(Path rootFolder) {
 		GradleDistribution distribution = getGradleDistribution(rootFolder);
 		IVMInstall javaDefaultRuntime = JavaRuntime.getDefaultVMInstall();
 		File javaHome;
+		Preferences preferences = getPreferences();
 		if (javaDefaultRuntime != null && javaDefaultRuntime.getVMRunner(ILaunchManager.RUN_MODE) != null) {
 			javaHome = javaDefaultRuntime.getInstallLocation();
 		} else {
-			String javaHomeStr = JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getJavaHome();
+			String javaHomeStr = preferences.getJavaHome();
 			javaHome = javaHomeStr == null ? null : new File(javaHomeStr);
 		}
 		File gradleUserHome = getGradleUserHomeFile();
-		List<String> gradleArguments = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleArguments() : new ArrayList<>();
-		List<String> gradleJvmArguments = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().getGradleJvmArguments() : new ArrayList<>();
-		boolean offlineMode = JavaLanguageServerPlugin.getPreferencesManager() != null ? JavaLanguageServerPlugin.getPreferencesManager().getPreferences().isImportGradleOfflineEnabled() : false;
+		List<String> gradleArguments = preferences.getGradleArguments();
+		List<String> gradleJvmArguments = preferences.getGradleJvmArguments();
+		boolean offlineMode = preferences.isImportGradleOfflineEnabled();
 		boolean overrideWorkspaceConfiguration = !(distribution instanceof WrapperGradleDistribution) || offlineMode || (gradleArguments != null && !gradleArguments.isEmpty()) || (gradleJvmArguments != null && !gradleJvmArguments.isEmpty())
 				|| gradleUserHome != null || javaHome != null;
 		// @formatter:off
@@ -263,22 +263,25 @@ public static BuildConfiguration getBuildConfiguration(Path rootFolder) {
 	}
 
 	public static boolean shouldSynchronize(File location) {
-		boolean shouldSynchronize = true;
-		List<IProject> projects = ProjectUtils.getGradleProjects();
-		for (IProject project : projects) {
+		for (IProject project : ProjectUtils.getGradleProjects()) {
 			File projectDir = project.getLocation() == null ? null : project.getLocation().toFile();
 			if (location.equals(projectDir)) {
-				shouldSynchronize = checkGradlePersistence(shouldSynchronize, project, projectDir);
-				break;
+				boolean shouldSynchronize = checkGradlePersistence(project, projectDir);
+				if (shouldSynchronize) {
+					JavaLanguageServerPlugin.logInfo(project.getName() + " was modified since last time the workspace was opened, must be synchronized");
+				}
+				return shouldSynchronize;
 			}
 		}
-		return shouldSynchronize;
+		JavaLanguageServerPlugin.logInfo("No previous Gradle project at " + location + ", it must be synchronized");
+		return true;
 	}
 
-	private static boolean checkGradlePersistence(boolean shouldSynchronize, IProject project, File projectDir) {
-		if (!ProjectUtils.isJavaProject(project) || !project.getFile(IJavaProject.CLASSPATH_FILE_NAME).exists()) {
+	private static boolean checkGradlePersistence(IProject project, File projectDir) {
+		if (ProjectUtils.isJavaProject(project) && !project.getFile(IJavaProject.CLASSPATH_FILE_NAME).exists()) {
 			return true;
 		}
+		boolean shouldSynchronize = true;
 		PersistentModel model = CorePlugin.modelPersistence().loadModel(project);
 		if (model.isPresent()) {
 			File persistentFile = CorePlugin.getInstance().getStateLocation().append("project-preferences").append(project.getName()).toFile();
@@ -306,4 +309,8 @@ public boolean accept(File dir, String name) {
 	public void reset() {
 	}
 
+	private static Preferences getPreferences() {
+		return (JavaLanguageServerPlugin.getPreferencesManager() == null || JavaLanguageServerPlugin.getPreferencesManager().getPreferences() == null) ? new Preferences() : JavaLanguageServerPlugin.getPreferencesManager().getPreferences();
+	}
+
 }
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/build.gradle b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/build.gradle
new file mode 100644
index 0000000000..976c0f2da8
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/build.gradle
@@ -0,0 +1,8 @@
+/*
+ * This build file was auto generated by running the Gradle 'init' task
+ * by 'fbricon' at '24/10/16 11:28' with Gradle 3.0
+ *
+ * This generated file contains a sample Java project to get you started.
+ * For more details take a look at the Java Quickstart chapter in the Gradle
+ * user guide available at https://docs.gradle.org/3.0/userguide/tutorial_java_projects.html
+ */
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew
new file mode 100755
index 0000000000..2fe81a7d95
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew
@@ -0,0 +1,183 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew.bat b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew.bat
new file mode 100644
index 0000000000..24467a141f
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/gradlew.bat
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/settings.gradle b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/settings.gradle
new file mode 100644
index 0000000000..004a8a3da6
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'gradle3'
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/main/java/Library.java b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/main/java/Library.java
new file mode 100644
index 0000000000..526aadc25a
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/main/java/Library.java
@@ -0,0 +1,11 @@
+/*
+ * This Java source file was auto generated by running 'gradle buildInit --type java-library'
+ * by 'fbricon' at '24/10/16 11:28' with Gradle 3.0
+ *
+ * @author fbricon, @date 24/10/16 11:28
+ */
+public class Library {
+    public boolean someLibraryMethod() {
+        return true;
+    }
+}
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/test/java/LibraryTest.java b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/test/java/LibraryTest.java
new file mode 100644
index 0000000000..af8df3303c
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/nested/gradle3/src/test/java/LibraryTest.java
@@ -0,0 +1,15 @@
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/*
+ * This Java source file was auto generated by running 'gradle init --type java-library'
+ * by 'fbricon' at '24/10/16 11:28' with Gradle 3.0
+ *
+ * @author fbricon, @date 24/10/16 11:28
+ */
+public class LibraryTest {
+    @Test public void testSomeLibraryMethod() {
+        Library classUnderTest = new Library();
+        assertTrue("someLibraryMethod should return 'true'", classUnderTest.someLibraryMethod());
+    }
+}
diff --git a/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java b/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java
index 1e3c9dd3dd..22e7b825d8 100644
--- a/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java
+++ b/org.eclipse.jdt.ls.tests/src/org/eclipse/jdt/ls/core/internal/managers/GradleProjectImporterTest.java
@@ -94,11 +94,14 @@ public void cleanUp() throws Exception {
 	@Test
 	public void importNestedGradleProject() throws Exception {
 		List<IProject> projects = importProjects("gradle/nested");
-		assertEquals(3, projects.size());//default + 2 gradle projects
+		assertEquals(4, projects.size());//default + 3 gradle projects
 		IProject gradle1 = WorkspaceHelper.getProject("gradle1");
 		assertIsGradleProject(gradle1);
 		IProject gradle2 = WorkspaceHelper.getProject("gradle2");
 		assertIsGradleProject(gradle2);
+		IProject gradle3 = WorkspaceHelper.getProject("gradle3");
+		assertIsGradleProject(gradle3);
+		assertFalse(ProjectUtils.isJavaProject(gradle3));
 	}
 
 	@Test
@@ -124,11 +127,13 @@ public void testJavaImportExclusions() throws Exception {
 		try {
 			javaImportExclusions.add(GRADLE1_PATTERN);
 			List<IProject> projects = importProjects("gradle/nested");
-			assertEquals(2, projects.size());//default + 1 gradle projects
+			assertEquals(3, projects.size());//default + 2 gradle projects
 			IProject gradle1 = WorkspaceHelper.getProject("gradle1");
 			assertNull(gradle1);
 			IProject gradle2 = WorkspaceHelper.getProject("gradle2");
 			assertIsGradleProject(gradle2);
+			IProject gradle3 = WorkspaceHelper.getProject("gradle3");
+			assertIsGradleProject(gradle3);
 		} finally {
 			javaImportExclusions.remove(GRADLE1_PATTERN);
 		}
@@ -233,12 +238,12 @@ public void testGradlePersistence() throws Exception {
 		importProjects("gradle/nested");
 		List<IProject> projects = ProjectUtils.getGradleProjects();
 		for (IProject project : projects) {
-			assertTrue(GradleProjectImporter.shouldSynchronize(project.getLocation().toFile()));
+			assertTrue(project.getName() + " should synchronize", GradleProjectImporter.shouldSynchronize(project.getLocation().toFile()));
 		}
 		Job.getJobManager().join(CorePlugin.GRADLE_JOB_FAMILY, new NullProgressMonitor());
 		GradleBuildSupport.saveModels();
 		for (IProject project : projects) {
-			assertFalse(GradleProjectImporter.shouldSynchronize(project.getLocation().toFile()));
+			assertFalse(project.getName() + " should not synchronize", GradleProjectImporter.shouldSynchronize(project.getLocation().toFile()));
 		}
 		IProject project = WorkspaceHelper.getProject("gradle1");
 		File gradleBuild = new File(project.getLocation().toFile(), "build.gradle");