diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/NameResolver.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/NameResolver.java
index 931e02d21d..e2704e20f3 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/NameResolver.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/NameResolver.java
@@ -99,6 +99,11 @@ public interface NameResolver<S> {
                 }
                 return null;
             }
+
+            @Override
+            public String toString() {
+                return "Composite[" + resolvers + "]";
+            }
         };
     }
 
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainIteratorImpl.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainIteratorImpl.java
index e81b8175dc..fc234944b6 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainIteratorImpl.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainIteratorImpl.java
@@ -34,7 +34,7 @@ class ShadowChainIteratorImpl<S, I>
             done();
             return;
         }
-        assert !next.getResolver().resolveHere(name).isEmpty() : "Shadow iterator stopped on wrong node";
+        assert !next.resolveHere(name).isEmpty() : "Shadow iterator stopped on wrong node";
         setNext(next);
     }
 
@@ -55,7 +55,7 @@ class ShadowChainIteratorImpl<S, I>
 
     @Override
     public List<S> getResults() {
-        return getCurrentValue().getResolver().resolveHere(name);
+        return getCurrentValue().resolveHere(name);
     }
 
     // inclusive of the parameter
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNode.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNode.java
index 7eae4d4cf0..1fdaa64217 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNode.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNode.java
@@ -4,6 +4,8 @@
 
 package net.sourceforge.pmd.lang.java.symbols.table.coreimpl;
 
+import java.util.List;
+
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import net.sourceforge.pmd.util.OptionalBool;
@@ -36,6 +38,13 @@ public interface ShadowChainNode<S, I> {
      */
     NameResolver<S> getResolver();
 
+    /**
+     * Wraps {@link #getResolver()}{@code .resolveHere()}, may do
+     * additional stuff like caching.
+     */
+    default List<S> resolveHere(String simpleName) {
+        return getResolver().resolveHere(simpleName);
+    }
 
     /**
      * Returns whether this node knows the given symbol (without asking
diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNodeBase.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNodeBase.java
index 3d5c955c2f..c547c88611 100644
--- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNodeBase.java
+++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/symbols/table/coreimpl/ShadowChainNodeBase.java
@@ -81,19 +81,33 @@ class ShadowChainNodeBase<S, I> implements ShadowChain<S, I>, ShadowChainNode<S,
 
     @Override
     public @NonNull List<S> resolve(String name) {
-        List<S> res = resolver.resolveHere(name);
-        handleResolverKnows(name, !res.isEmpty());
+        List<S> res = this.resolveHere(name);
         if (res.isEmpty()) {
+            // failed, continue
             return getParent().asChain().resolve(name);
-        } else if (!isShadowBarrier()) {
-            // A successful search ends on the first node that is a
-            // shadow barrier, inclusive
-            // A failed search continues regardless
-            return merger.apply(res, getParent().asChain().resolve(name));
+        } else {
+            // successful search: fetch all non-shadowed names
+            // note: we can't call ShadowChain::resolve on the parent
+            // as it would ignore the shadow barriers if the parent
+            // does not know the name.
+            ShadowChainNode<S, I> node = this;
+            while (!node.isShadowBarrier() && node.getParent() != null) {
+                // The search ends on the first node that is a
+                // shadow barrier, inclusive.
+                node = node.getParent();
+                res = merger.apply(res, node.resolveHere(name));
+            }
         }
         return res;
     }
 
+    @Override
+    public List<S> resolveHere(String simpleName) {
+        List<S> res = resolver.resolveHere(simpleName);
+        handleResolverKnows(simpleName, !res.isEmpty());
+        return res;
+    }
+
     protected void handleResolverKnows(String name, boolean resolverKnows) {
         // to be overridden
     }
diff --git a/pmd-java/src/test/java/javasymbols/testdata/deep/StaticContainer.java b/pmd-java/src/test/java/javasymbols/testdata/deep/StaticContainer.java
new file mode 100644
index 0000000000..28f2c69694
--- /dev/null
+++ b/pmd-java/src/test/java/javasymbols/testdata/deep/StaticContainer.java
@@ -0,0 +1,15 @@
+/*
+ * BSD-style license; for more info see http://pmd.sourceforge.net/license.html
+ */
+
+package javasymbols.testdata.deep;
+
+public class StaticContainer {
+
+    /**
+     * Shadows a java.lang member
+     */
+    public static class Exception {
+
+    }
+}
diff --git a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
index 2ce3b7e540..c942139e0d 100644
--- a/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
+++ b/pmd-java/src/test/java/net/sourceforge/pmd/lang/java/JavaParsingHelper.java
@@ -5,6 +5,7 @@
 package net.sourceforge.pmd.lang.java;
 
 import java.io.PrintStream;
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.apache.commons.lang3.StringUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.NotNull;
 
@@ -126,4 +128,41 @@ public class JavaParsingHelper extends BaseParsingHelper<JavaParsingHelper, ASTC
             return baseLogger.hasError();
         }
     }
+
+    /**
+     * Will throw on the first semantic error or warning.
+     * Useful because it produces a stack trace for that warning/error.
+     */
+    public static class UnforgivingSemanticLogger implements SemanticErrorReporter {
+
+        private static final int MAX_NODE_TEXT_WIDTH = 100;
+        public static final UnforgivingSemanticLogger INSTANCE = new UnforgivingSemanticLogger();
+
+        private UnforgivingSemanticLogger() {
+
+        }
+
+        @Override
+        public void warning(Node location, String message, Object... formatArgs) {
+            String warning = MessageFormat.format(message, formatArgs);
+            throw new AssertionError(
+                "Expected no warnings, but got: " + warning + "\n"
+                    + "at " + StringUtils.truncate(location.toString(), 100)
+            );
+        }
+
+        @Override
+        public SemanticException error(Node location, String message, Object... formatArgs) {
+            String error = MessageFormat.format(message, formatArgs);
+            throw new AssertionError(
+                "Expected no errors, but got: " + error + "\n"
+                    + "at " + StringUtils.truncate(location.toString(), MAX_NODE_TEXT_WIDTH)
+            );
+        }
+
+        @Override
+        public boolean hasError() {
+            return false;
+        }
+    }
 }
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
index a7f77a33b7..fa1a6e342a 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/ast/KotlinTestingDsl.kt
@@ -9,22 +9,15 @@ import com.github.oowekyala.treeutils.printers.KotlintestBeanTreePrinter
 import io.kotest.assertions.throwables.shouldThrow
 import io.kotest.matchers.Matcher
 import io.kotest.matchers.MatcherResult
-import io.kotest.matchers.string.shouldContain
 import io.kotest.matchers.collections.shouldContainAll
 import net.sourceforge.pmd.lang.LanguageRegistry
-import net.sourceforge.pmd.lang.ast.Node
-import net.sourceforge.pmd.lang.ast.ParseException
-import net.sourceforge.pmd.lang.ast.TokenMgrError
+import net.sourceforge.pmd.lang.ast.*
 import net.sourceforge.pmd.lang.ast.test.*
 import net.sourceforge.pmd.lang.java.JavaLanguageModule
 import net.sourceforge.pmd.lang.java.JavaParsingHelper
-import net.sourceforge.pmd.lang.java.JavaParsingHelper.TestCheckLogger
-import net.sourceforge.pmd.lang.java.JavaParsingHelper.WITH_PROCESSING
-import org.apache.commons.io.output.TeeOutputStream
+import net.sourceforge.pmd.lang.java.JavaParsingHelper.*
 import java.beans.PropertyDescriptor
-import java.io.ByteArrayOutputStream
 import java.io.PrintStream
-import java.nio.charset.StandardCharsets
 
 /**
  * Represents the different Java language versions.
@@ -204,6 +197,14 @@ open class ParserTestCtx(val javaVersion: JavaVersion = JavaVersion.Latest,
         return logger
     }
 
+    /**
+     * Will throw on the first semantic error or warning.
+     * Useful because it produces a stack trace for that warning/error.
+     */
+    fun assertNoSemanticErrorsOrWarnings() {
+        parser = parser.withProcessing(true).withLogger(UnforgivingSemanticLogger.INSTANCE)
+    }
+
     /** Returns a function that can retrieve the log*/
     fun logTypeInference(verbose: Boolean = false, to: PrintStream = System.err) {
         parser = parser.withProcessing(true).logTypeInference(verbose, to)
@@ -275,4 +276,3 @@ open class ParserTestCtx(val javaVersion: JavaVersion = JavaVersion.Latest,
     }
 
 }
-
diff --git a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/HeaderScopesTest.kt b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/HeaderScopesTest.kt
index 6f7cae130f..07b6d51346 100644
--- a/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/HeaderScopesTest.kt
+++ b/pmd-java/src/test/kotlin/net/sourceforge/pmd/lang/java/symbols/table/internal/HeaderScopesTest.kt
@@ -9,6 +9,9 @@ package net.sourceforge.pmd.lang.java.symbols.table.internal
 import io.kotest.matchers.collections.shouldContainExactly
 import io.kotest.matchers.collections.shouldHaveSize
 import io.kotest.matchers.collections.haveSize
+import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
+import io.kotest.matchers.maps.shouldBeEmpty
+import io.kotest.matchers.maps.shouldContain
 import io.kotest.matchers.should
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.shouldNotBe
@@ -20,7 +23,6 @@ import net.sourceforge.pmd.lang.java.ast.ProcessorTestSpec
 import net.sourceforge.pmd.lang.java.symbols.JClassSymbol
 import net.sourceforge.pmd.lang.java.symbols.JFieldSymbol
 import net.sourceforge.pmd.lang.java.symbols.JMethodSymbol
-import net.sourceforge.pmd.lang.java.symbols.JTypeDeclSymbol
 import net.sourceforge.pmd.lang.java.symbols.internal.classSym
 import net.sourceforge.pmd.lang.java.symbols.internal.getDeclaredMethods
 import net.sourceforge.pmd.lang.java.symbols.table.JSymbolTable
@@ -283,6 +285,49 @@ class HeaderScopesTest : ProcessorTestSpec({
             }
         }
     }
+
+
+    parserTest("#3768 static imported type shadows java.lang") {
+        assertNoSemanticErrorsOrWarnings()
+
+        val acu = parser.parse(
+            """
+            import static javasymbols.testdata.deep.StaticContainer.Exception;
+
+            class Foo {
+                static {
+                    Exception e;
+                }
+            }
+            """
+        )
+
+        acu.symbolTable.types()
+            .shouldResolveToClass("Exception", "javasymbols.testdata.deep.StaticContainer\$Exception")
+    }
+
+    parserTest("#3768 static imported type does not shadow non-static imported type") {
+
+        val acu = parser.parse(
+            """
+            import static javasymbols.testdata.deep.StaticContainer.Exception;
+            import java.lang.Exception;
+
+            class Foo {
+                static {
+                    Exception e;
+                }
+            }
+            """
+        )
+
+        acu.symbolTable.types().resolve("Exception")
+            .map { (it.symbol as JClassSymbol).binaryName }
+            .shouldContainExactlyInAnyOrder(
+                "javasymbols.testdata.deep.StaticContainer\$Exception",
+                "java.lang.Exception"
+            )
+    }
 })
 
 
diff --git a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
index f5d70c0767..7ea13ad486 100644
--- a/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
+++ b/pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/lang/ast/test/BaseParsingHelper.kt
@@ -75,8 +75,8 @@ abstract class BaseParsingHelper<Self : BaseParsingHelper<Self, T>, T : RootNode
     protected abstract fun clone(params: Params): Self
 
     @JvmOverloads
-    fun withProcessing(boolean: Boolean = true): Self =
-            clone(params.copy(doProcess = boolean))
+    fun withProcessing(doProcess: Boolean = true): Self =
+            clone(params.copy(doProcess = doProcess))
 
     /**
      * Returns an instance of [Self] for which all parsing methods