diff --git a/org.eclipse.jdt.ls.core/build.properties b/org.eclipse.jdt.ls.core/build.properties
index fe63bd3293..852ef3aafa 100644
--- a/org.eclipse.jdt.ls.core/build.properties
+++ b/org.eclipse.jdt.ls.core/build.properties
@@ -12,5 +12,6 @@ bin.includes = META-INF/,\
                gradle/init/init.gradle,\
                gradle/android/init.gradle,\
                gradle/apt/init.gradle,\
+               gradle/aspectj/init.gradle,\
                about.html
 src.includes = about.html
diff --git a/org.eclipse.jdt.ls.core/gradle/aspectj/init.gradle b/org.eclipse.jdt.ls.core/gradle/aspectj/init.gradle
new file mode 100644
index 0000000000..776c44ac7b
--- /dev/null
+++ b/org.eclipse.jdt.ls.core/gradle/aspectj/init.gradle
@@ -0,0 +1,73 @@
+import org.gradle.plugins.ide.eclipse.model.EclipseModel
+
+gradle.projectsEvaluated { g ->
+	if (System.getProperty("eclipse.application") == null) return
+	def weavingPluginId = "io.freefair.aspectj.post-compile-weaving"
+	def allprojects = g.rootProject.allprojects
+	boolean hasWeaving = allprojects.any { it.plugins.hasPlugin(weavingPluginId) }
+	allprojects.each { p ->
+		if (p.plugins.hasPlugin("eclipse")) {
+			EclipseModel eclipseModel = (EclipseModel) p.property("eclipse")
+			if (hasWeaving) {
+				if (GradleVersion.version(p.getGradle().getGradleVersion()) >= GradleVersion.version("5.4")) {
+					try {
+						try {
+							Task task = p.getTasks().getByName("classes")
+							eclipseModel.synchronizationTasks "classes"
+						} catch (UnknownTaskException e) {
+							// ignore
+						}
+					} catch (Exception e) {
+						// ignore
+					}
+				}
+			}
+			if (p.plugins.hasPlugin("io.freefair.aspectj")) {
+				String[] taskNames = [ "compileAspectj", "compileTestAspectj" ]
+				if (GradleVersion.version(p.getGradle().getGradleVersion()) >= GradleVersion.version("5.4")) {
+					for (final String taskName : taskNames) {
+						try {
+							Task task = p.getTasks().getByName(taskName)
+							eclipseModel.synchronizationTasks taskName
+						} catch (Exception e) {
+							// ignore
+						}
+					}
+				}
+				eclipseModel.classpath.file.whenMerged { cp ->
+					File projectDir = p.getProjectDir()
+					for (final String taskName : taskNames) {
+						Task task
+						try {
+							task = p.getTasks().getByName(taskName)
+						} catch (UnknownTaskException e) {
+							task = null;
+						}
+						if (task == null) {
+							continue
+						}
+						if (task.hasProperty("destinationDirectory")) {
+							def prop = task.destinationDirectory;
+							Object outputDir = null
+							if (prop instanceof org.gradle.api.file.DirectoryProperty) {
+								outputDir = prop.asFile.getOrNull()
+							} else if (prop instanceof File) {
+								outputDir = prop
+							}
+							if (outputDir != null && outputDir.exists()) {
+								cp.entries.removeAll { it instanceof org.gradle.plugins.ide.eclipse.model.Library && it.path.equals(outputDir.toString()) }
+								Object entry = new org.gradle.plugins.ide.eclipse.model.Library(fileReference(outputDir))
+								entry.exported = true
+								entry.entryAttributes.put("aspectj_generated", "true")
+								entry.entryAttributes.put("optional", "true")
+								entry.entryAttributes.put("ignore_optional_problems", "true")
+								cp.entries.add(entry)
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
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 1c98261491..fd1c3e3645 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
@@ -717,6 +717,12 @@ private static List<String> getGradleInitScriptArgs() {
 			addInitScriptToArgs(androidInitScript, args);
 		}
 
+		// Add init script of aspectj support
+		if (preferencesManager.getPreferences().isAspectjSupportEnabled()) {
+			File aspectjInitScript = GradleUtils.getGradleInitScript("/gradle/aspectj/init.gradle");
+			addInitScriptToArgs(aspectjInitScript, args);
+		}
+
 		return args;
 	}
 
diff --git a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
index 37dffcce9d..eb01045853 100644
--- a/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
+++ b/org.eclipse.jdt.ls.core/src/org/eclipse/jdt/ls/core/internal/preferences/Preferences.java
@@ -522,6 +522,7 @@ public class Preferences {
 
 	public static final String JAVA_JDT_LS_PROTOBUF_SUPPORT_ENABLED = "java.jdt.ls.protobufSupport.enabled";
 	public static final String JAVA_JDT_LS_ANDROID_SUPPORT_ENABLED = "java.jdt.ls.androidSupport.enabled";
+	public static final String JAVA_JDT_LS_ASPECTJ_SUPPORT_ENABLED = "java.jdt.ls.aspectjSupport.enabled";
 	public static final String JAVA_JDT_LS_JAVAC_ENABLED = "java.jdt.ls.javac.enabled";
 
 	public static final String JAVA_COMPILE_NULLANALYSIS_NONNULL = "java.compile.nullAnalysis.nonnull";
@@ -709,6 +710,7 @@ public class Preferences {
 	private ProjectEncodingMode projectEncoding;
 	private boolean avoidVolatileChanges;
 	private boolean protobufSupportEnabled;
+	private boolean aspectjSupportEnabled;
 	private boolean javacEnabled;
 	private boolean androidSupportEnabled;
 	private List<String> nonnullTypes;
@@ -1137,6 +1139,7 @@ public Preferences clone() {
 		prefs.projectEncoding = this.projectEncoding;
 		prefs.avoidVolatileChanges = this.avoidVolatileChanges;
 		prefs.protobufSupportEnabled = this.protobufSupportEnabled;
+		prefs.aspectjSupportEnabled = this.aspectjSupportEnabled;
 		prefs.javacEnabled = this.javacEnabled;
 		prefs.androidSupportEnabled = this.androidSupportEnabled;
 		prefs.nullAnalysisMode = this.nullAnalysisMode;
@@ -1753,6 +1756,11 @@ public static Preferences updateFrom(Preferences existing, Map<String, Object> c
 			prefs.setProtobufSupportEnabled(protobufSupported);
 		}
 
+		if (getValue(configuration, JAVA_JDT_LS_ASPECTJ_SUPPORT_ENABLED) != null) {
+			boolean aspectjSupported = getBoolean(configuration, JAVA_JDT_LS_ASPECTJ_SUPPORT_ENABLED, existing.aspectjSupportEnabled);
+			prefs.setAspectjSupportEnabled(aspectjSupported);
+		}
+
 		if (getValue(configuration, JAVA_JDT_LS_JAVAC_ENABLED) != null) {
 			boolean javacEnabled = getBoolean(configuration, JAVA_JDT_LS_JAVAC_ENABLED, existing.javacEnabled);
 			prefs.setJavacEnabled(javacEnabled);
@@ -2863,6 +2871,14 @@ public void setProtobufSupportEnabled(boolean protobufSupportEnabled) {
 		this.protobufSupportEnabled = protobufSupportEnabled;
 	}
 
+	public boolean isAspectjSupportEnabled() {
+		return aspectjSupportEnabled;
+	}
+
+	public void setAspectjSupportEnabled(boolean aspectjSupportEnabled) {
+		this.aspectjSupportEnabled = aspectjSupportEnabled;
+	}
+
 	public boolean isAndroidSupportEnabled() {
 		return this.androidSupportEnabled;
 	}
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/build.gradle b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/build.gradle
new file mode 100644
index 0000000000..196b696282
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/build.gradle
@@ -0,0 +1,55 @@
+plugins {
+    id("io.freefair.aspectj") version "8.10.2"
+}
+
+apply plugin: 'java'
+apply plugin: 'eclipse'
+apply plugin: "io.freefair.aspectj"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    implementation "org.aspectj:aspectjrt:1.9.25"
+}
+
+compileAspectj {
+        sourceCompatibility "17"
+        targetCompatibility "17"
+}
+compileTestAspectj {
+        sourceCompatibility "17"
+        targetCompatibility "17"
+}
+
+compileAspectj {
+    ajcOptions {
+        outxml = true
+        outxmlfile = "bar.xml"
+    }
+}
+
+compileAspectj.ajcOptions.outxml = true
+compileAspectj.ajcOptions.outxmlfile = "bar.xml"
+
+eclipse {
+  classpath {
+    defaultOutputDir = file('target')
+    file {
+        whenMerged {
+            cp -> cp.getEntries().forEach{
+                cpEntry -> if(cpEntry.kind=='src') {
+                    cpEntry.output = cpEntry.output.replace('bin/', 'target/')
+                }
+            }
+        }
+    }
+  }
+}
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.jar b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..d64cd49177
Binary files /dev/null and b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.properties b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..1af9e0930b
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradlew b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradlew
new file mode 100755
index 0000000000..2fe81a7d95
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/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/aspect/gradlew.bat b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/gradlew.bat
new file mode 100644
index 0000000000..24467a141f
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/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/aspect/src/build.gradle b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/build.gradle
new file mode 100644
index 0000000000..1ce50b2ecf
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/build.gradle
@@ -0,0 +1,22 @@
+apply plugin: "io.freefair.aspectj"
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+    targetCompatibility = "11"
+}
+
+dependencies {
+    implementation "org.aspectj:aspectjrt:1.9.25"
+}
+
+compileAspectj {
+    ajcOptions {
+        outxml = true
+        outxmlfile = "bar.xml"
+    }
+}
+
+compileAspectj.ajcOptions.outxml = true
+compileAspectj.ajcOptions.outxmlfile = "bar.xml"
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/aspectj/io/freefair/DemoAspect.aj b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/aspectj/io/freefair/DemoAspect.aj
new file mode 100644
index 0000000000..35fb3a9928
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/aspectj/io/freefair/DemoAspect.aj
@@ -0,0 +1,4 @@
+package io.freefair;
+
+public aspect DemoAspect {
+}
diff --git a/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/java/io/freefair/Demo.java b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/java/io/freefair/Demo.java
new file mode 100644
index 0000000000..5afe5ee82c
--- /dev/null
+++ b/org.eclipse.jdt.ls.tests/projects/gradle/aspect/src/main/java/io/freefair/Demo.java
@@ -0,0 +1,10 @@
+package io.freefair;
+
+import org.aspectj.lang.annotation.Aspect;
+
+@Aspect
+public class Demo {
+
+	private DemoAspect demoAspect;
+    
+}
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 9c7292b29c..537432d270 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
@@ -759,6 +759,35 @@ public void testGetGradleDistribution() {
 		assertTrue(distribution instanceof WrapperGradleDistribution);
 	}
 
+	@Test
+	public void testAspectSupportDisabled() throws Exception {
+		boolean oldAspectSupported = this.preferences.isAspectjSupportEnabled();
+		try {
+			this.preferences.setAspectjSupportEnabled(false);
+			IProject project = importGradleProject("aspect");
+			assertTrue(ProjectUtils.isGradleProject(project));
+			assertHasErrors(project);
+
+		} finally {
+			this.preferences.setAspectjSupportEnabled(oldAspectSupported);
+		}
+	}
+
+	@Test
+	public void testAspectSupportEnabled() throws Exception {
+		boolean oldAspectSupported = this.preferences.isAspectjSupportEnabled();
+		try {
+			this.preferences.setAspectjSupportEnabled(true);
+			IProject project = importGradleProject("aspect");
+			assertTrue(ProjectUtils.isGradleProject(project));
+			assertNoErrors(project);
+			IJavaProject javaProject = JavaCore.create(project);
+			IType demoAspect = javaProject.findType("io.freefair.DemoAspect");
+			assertNotNull(demoAspect);
+		} finally {
+			this.preferences.setAspectjSupportEnabled(oldAspectSupported);
+		}
+	}
 
 	@Test
 	public void testCleanUpBuildServerFootprint() throws Exception {