diff --git a/coverage/pom.xml b/coverage/pom.xml
index fc7b5afdc..dd4456c98 100644
--- a/coverage/pom.xml
+++ b/coverage/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2014-2023 Lukas Krejci
+    Copyright 2014-2025 Lukas Krejci
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -113,6 +113,12 @@
                             <goal>report-aggregate</goal>
                         </goals>
                         <phase>verify</phase>
+                        <configuration>
+                            <!-- Exclude alternate versions for multi-release modules due to https://github.com/jacoco/jacoco/issues/407 -->
+                            <excludes>
+                                <exclude>META-INF/**/*</exclude>
+                            </excludes>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/revapi-build/pom.xml b/revapi-build/pom.xml
index 729e08a74..bdb12efe3 100644
--- a/revapi-build/pom.xml
+++ b/revapi-build/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2014-2023 Lukas Krejci
+    Copyright 2014-2025 Lukas Krejci
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -172,6 +172,10 @@
                         </goals>
                         <phase>test</phase>
                         <configuration>
+                            <!-- Exclude alternate versions for multi-release modules due to https://github.com/jacoco/jacoco/issues/407 -->
+                            <excludes>
+                                <exclude>META-INF/**/*</exclude>
+                            </excludes>
                             <dataFile>${project.build.directory}/jacoco-ut.exec</dataFile>
                         </configuration>
                     </execution>
diff --git a/revapi-java-spi/pom.xml b/revapi-java-spi/pom.xml
index 5219ecdd2..a29a370cd 100644
--- a/revapi-java-spi/pom.xml
+++ b/revapi-java-spi/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright 2014-2022 Lukas Krejci
+    Copyright 2014-2025 Lukas Krejci
     and other contributors as indicated by the @author tags.
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,6 @@
     </distributionManagement>
     <properties>
         <automatic.module.name>org.revapi.java.spi</automatic.module.name>
-        <jacoco.skip>true</jacoco.skip>
     </properties>
     <dependencies>
         <dependency>
diff --git a/revapi-java/pom.xml b/revapi-java/pom.xml
index dd0f91f46..304f6e634 100644
--- a/revapi-java/pom.xml
+++ b/revapi-java/pom.xml
@@ -151,6 +151,22 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-jar</id>
+                        <configuration>
+                            <archive>
+                                <manifestEntries>
+                                    <Multi-Release>true</Multi-Release>
+                                </manifestEntries>
+                            </archive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
diff --git a/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/Compiler.java b/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/Compiler.java
new file mode 100644
index 000000000..d09a1d59c
--- /dev/null
+++ b/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/Compiler.java
@@ -0,0 +1,241 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package org.revapi.java.compilation;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.IdentityHashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+import javax.tools.JavaCompiler;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.ToolProvider;
+
+import org.revapi.Archive;
+import org.revapi.TreeFilter;
+import org.revapi.java.AnalysisConfiguration;
+import org.revapi.java.Timing;
+import org.revapi.java.spi.JarExtractor;
+import org.revapi.java.spi.JavaElement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Lukas Krejci
+ *
+ * @since 0.1
+ */
+public final class Compiler {
+    private static final Logger LOG = LoggerFactory.getLogger(Compiler.class);
+
+    private final JavaCompiler compiler;
+    private final Writer output;
+    private final Iterable<? extends Archive> classPath;
+    private final Iterable<? extends Archive> additionalClassPath;
+    private final ExecutorService executor;
+    private final TreeFilter<JavaElement> filter;
+    private final Iterable<JarExtractor> jarExtractors;
+
+    public Compiler(ExecutorService executor, Writer reportingOutput, Iterable<JarExtractor> jarExtractors,
+                    Iterable<? extends Archive> classPath, Iterable<? extends Archive> additionalClassPath,
+                    TreeFilter<JavaElement> filter) {
+        this.jarExtractors = jarExtractors;
+
+        compiler = ToolProvider.getSystemJavaCompiler();
+        if (compiler == null) {
+            throw new AssertionError("Could not obtain the system compiler. Is tools.jar on the classpath?");
+        }
+
+        this.executor = executor;
+        this.output = reportingOutput;
+        this.classPath = classPath;
+        this.additionalClassPath = additionalClassPath;
+        this.filter = filter;
+    }
+
+    public CompilationValve compile(final ProbingEnvironment environment,
+                                    final AnalysisConfiguration.MissingClassReporting missingClassReporting,
+                                    final boolean ignoreMissingAnnotations) throws Exception {
+
+        File targetPath = Files.createTempDirectory("revapi-java").toAbsolutePath().toFile();
+
+        File sourceDir = new File(targetPath, "sources");
+        sourceDir.mkdir();
+
+        File lib = new File(targetPath, "lib");
+        lib.mkdir();
+
+        // make sure the classpath is in the same order as passed in
+        int classPathSize = size(classPath);
+        int nofArchives = classPathSize + size(additionalClassPath);
+
+        int prefixLength = (int) Math.log10(nofArchives) + 1;
+
+        IdentityHashMap<Archive, File> classPathFiles = copyArchives(classPath, lib, 0, prefixLength);
+        IdentityHashMap<Archive, File> additionClassPathFiles = copyArchives(additionalClassPath, lib, classPathSize,
+                prefixLength);
+
+        List<String> options = Arrays.asList("-d", sourceDir.toString(), "--module-path", lib.getAbsolutePath(),
+                "--add-modules", "ALL-MODULE-PATH");
+
+        List<JavaFileObject> sources = Arrays.<JavaFileObject> asList(new MarkerAnnotationObject(),
+                new ArchiveProbeObject());
+
+        // the locale and charset are actually not important, because the only sources we're providing
+        // are not file-based. The rest of the stuff the compiler will be touching is already compiled
+        // and therefore not affected by the charset.
+        StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, Locale.getDefault(),
+                Charset.forName("UTF-8"));
+
+        final JavaCompiler.CompilationTask task = compiler.getTask(output, fileManager, null, options,
+                Collections.singletonList(ArchiveProbeObject.CLASS_NAME), sources);
+
+        ProbingAnnotationProcessor processor = new ProbingAnnotationProcessor(environment);
+
+        task.setProcessors(Collections.singletonList(processor));
+
+        Future<Boolean> future = processor.submitWithCompilationAwareness(executor, task, () -> {
+            if (Timing.LOG.isDebugEnabled()) {
+                Timing.LOG.debug("About to crawl " + environment.getApi());
+            }
+
+            try {
+                new ClasspathScanner(fileManager, environment, classPathFiles, additionClassPathFiles,
+                        missingClassReporting, ignoreMissingAnnotations, filter).initTree();
+            } catch (IOException e) {
+                throw new IllegalStateException("Failed to scan the classpath.", e);
+            }
+
+            if (Timing.LOG.isDebugEnabled()) {
+                Timing.LOG.debug("Crawl finished for " + environment.getApi());
+            }
+        });
+
+        return new CompilationValve(future, targetPath, environment, fileManager);
+    }
+
+    private String composeClassPath(File classPathDir) {
+        StringBuilder bld = new StringBuilder();
+
+        File[] jars = classPathDir.listFiles();
+
+        if (jars == null || jars.length == 0) {
+            return "";
+        }
+
+        List<File> sortedJars = new ArrayList<>(Arrays.asList(jars));
+        Collections.sort(sortedJars, new Comparator<File>() {
+            @Override
+            public int compare(File o1, File o2) {
+                return o1.getName().compareTo(o2.getName());
+            }
+        });
+
+        Iterator<File> it = sortedJars.iterator();
+
+        bld.append(it.next().getAbsolutePath());
+        while (it.hasNext()) {
+            bld.append(File.pathSeparator).append(it.next().getAbsolutePath());
+        }
+
+        return bld.toString();
+    }
+
+    private IdentityHashMap<Archive, File> copyArchives(Iterable<? extends Archive> archives, File parentDir,
+                                                        int startIdx, int prefixLength) {
+        IdentityHashMap<Archive, File> ret = new IdentityHashMap<>();
+        if (archives == null) {
+            return ret;
+        }
+
+        for (Archive a : archives) {
+            String name = formatName(startIdx++, prefixLength, a.getName());
+            File f = new File(parentDir, name);
+
+            ret.put(a, f);
+
+            if (f.exists()) {
+                LOG.warn("File " + f.getAbsolutePath() + " with the data of archive '" + a.getName()
+                        + "' already exists." + " Assume it already contains the bits we need.");
+                continue;
+            }
+
+            Path target = new File(parentDir, name).toPath();
+
+            try (InputStream data = extracted(a)) {
+                Files.copy(data, target);
+            } catch (IOException e) {
+                throw new IllegalStateException(
+                        "Failed to copy class path element: " + a.getName() + " to " + f.getAbsolutePath(), e);
+            }
+        }
+
+        return ret;
+    }
+
+    private InputStream extracted(Archive archive) throws IOException {
+        for (JarExtractor t : jarExtractors) {
+            Optional<InputStream> extracted = t.extract(archive);
+            if (extracted.isPresent()) {
+                return extracted.get();
+            }
+        }
+
+        return archive.openStream();
+    }
+
+    private int size(Iterable<?> collection) {
+        if (collection == null) {
+            return 0;
+        }
+
+        int ret = 0;
+        Iterator<?> it = collection.iterator();
+        while (it.hasNext()) {
+            ret++;
+            it.next();
+        }
+
+        return ret;
+    }
+
+    private String formatName(int idx, int prefixLength, String rootName) {
+        try {
+            return String.format("%0" + prefixLength + "d-%s.jar", idx,
+                    UUID.nameUUIDFromBytes(rootName.getBytes("UTF-8")));
+        } catch (UnsupportedEncodingException e) {
+            throw new IllegalStateException("UTF-8 not supported.");
+        }
+    }
+}
diff --git a/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java b/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java
new file mode 100644
index 000000000..13eae185d
--- /dev/null
+++ b/revapi-java/src/main/java-mr/9/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package org.revapi.java.compilation;
+
+import java.io.Writer;
+import java.util.List;
+import java.util.Map;
+
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.Name;
+import javax.lang.model.element.PackageElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+
+import org.revapi.java.spi.IgnoreCompletionFailures;
+
+/**
+ * @author Lukas Krejci
+ *
+ * @since 0.1
+ */
+final class MissingTypeAwareDelegatingElements implements Elements {
+    private final Elements elements;
+
+    MissingTypeAwareDelegatingElements(Elements elements) {
+        this.elements = elements;
+    }
+
+    @Override
+    public PackageElement getPackageElement(CharSequence name) {
+        return IgnoreCompletionFailures.in(elements::getPackageElement, name);
+    }
+
+    @Override
+    public TypeElement getTypeElement(CharSequence name) {
+        return IgnoreCompletionFailures.in(elements::getTypeElement, name);
+    }
+
+    @Override
+    public Map<? extends ExecutableElement, ? extends AnnotationValue> getElementValuesWithDefaults(
+            AnnotationMirror a) {
+
+        return IgnoreCompletionFailures.in(elements::getElementValuesWithDefaults, a);
+    }
+
+    @Override
+    public String getDocComment(Element e) {
+        return IgnoreCompletionFailures.in(elements::getDocComment, e);
+    }
+
+    @Override
+    public boolean isDeprecated(Element e) {
+        return IgnoreCompletionFailures.in(elements::isDeprecated, e);
+    }
+
+    @Override
+    public Name getBinaryName(TypeElement type) {
+        return IgnoreCompletionFailures.in(elements::getBinaryName, type);
+    }
+
+    @Override
+    public PackageElement getPackageOf(Element type) {
+        return IgnoreCompletionFailures.in(elements::getPackageOf, type);
+    }
+
+    @Override
+    public List<? extends Element> getAllMembers(TypeElement type) {
+        return IgnoreCompletionFailures.in(elements::getAllMembers, type);
+    }
+
+    @Override
+    public List<? extends AnnotationMirror> getAllAnnotationMirrors(Element e) {
+        return IgnoreCompletionFailures.in(elements::getAllAnnotationMirrors, e);
+    }
+
+    @Override
+    public boolean hides(Element hider, Element hidden) {
+        return IgnoreCompletionFailures.in(elements::hides, hider, hidden);
+    }
+
+    @Override
+    public boolean overrides(ExecutableElement overrider, ExecutableElement overridden, TypeElement type) {
+        return IgnoreCompletionFailures.in(elements::overrides, overrider, overridden, type);
+    }
+
+    @Override
+    public String getConstantExpression(Object value) {
+        return IgnoreCompletionFailures.in(elements::getConstantExpression, value);
+    }
+
+    @Override
+    public void printElements(Writer w, Element... elems) {
+        IgnoreCompletionFailures.inVoid(elements::printElements, w, elems);
+    }
+
+    @Override
+    public boolean isFunctionalInterface(TypeElement type) {
+        return elements.isFunctionalInterface(type);
+    }
+
+    @Override
+    public Name getName(CharSequence cs) {
+        try {
+            return elements.getName(cs);
+        } catch (Exception ex) {
+            throw new IllegalStateException(ex);
+        }
+    }
+
+    @Override
+    public ModuleElement getModuleOf(Element e) {
+        return elements.getModuleOf(e);
+    }
+}
diff --git a/revapi-java/src/main/java/org/revapi/java/compilation/ClasspathScanner.java b/revapi-java/src/main/java/org/revapi/java/compilation/ClasspathScanner.java
index 6ab394b03..c09fd5ec9 100644
--- a/revapi-java/src/main/java/org/revapi/java/compilation/ClasspathScanner.java
+++ b/revapi-java/src/main/java/org/revapi/java/compilation/ClasspathScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2024 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/revapi-java/src/main/java/org/revapi/java/compilation/Compiler.java b/revapi-java/src/main/java/org/revapi/java/compilation/Compiler.java
index 3212d1c5a..64cf16442 100644
--- a/revapi-java/src/main/java/org/revapi/java/compilation/Compiler.java
+++ b/revapi-java/src/main/java/org/revapi/java/compilation/Compiler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/revapi-java/src/main/java/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java b/revapi-java/src/main/java/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java
index 807b1ca23..78478a0a2 100644
--- a/revapi-java/src/main/java/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java
+++ b/revapi-java/src/main/java/org/revapi/java/compilation/MissingTypeAwareDelegatingElements.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/revapi-java/src/test/java/org/revapi/java/JavaArchiveAnalyzerTest.java b/revapi-java/src/test/java/org/revapi/java/JavaArchiveAnalyzerTest.java
index ad3c0d2b5..4035e8178 100644
--- a/revapi-java/src/test/java/org/revapi/java/JavaArchiveAnalyzerTest.java
+++ b/revapi-java/src/test/java/org/revapi/java/JavaArchiveAnalyzerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,6 +16,8 @@
  */
 package org.revapi.java;
 
+import static java.lang.Integer.parseInt;
+import static java.lang.System.getProperty;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.singletonList;
 import static java.util.stream.Collectors.toSet;
@@ -37,6 +39,7 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Assert;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.revapi.API;
@@ -56,6 +59,8 @@
  * @since 0.1
  */
 public class JavaArchiveAnalyzerTest extends AbstractJavaElementAnalyzerTest {
+    public static final String A_PACKAGE_PATH = "a/";
+    public static final String SUP_PACKAGE_PATH = "sup/";
     private JavaApiAnalyzer apiAnalyzer;
 
     @Before
@@ -82,22 +87,50 @@ public void testSimple() throws Exception {
         }
     }
 
+    @Test
+    public void testWithSupplementaryWithSplitPackageInJava8() throws Exception {
+        String javaVersion = getProperty("java.version");
+        int majorVersion = getMajorJavaVersion(javaVersion);
+
+        // Assume that the Java version is 8 or lower; otherwise, the test will be ignored.
+        Assume.assumeTrue("Test ignored on Java 9 and above", majorVersion <= 8);
+
+        testWithSupplementaryJar("", "", "C", "java8/v1/supplementary/a/A.java", "java8/v1/supplementary/b/B.java",
+                "java8/v1/supplementary/a/C.java", "", "");
+    }
+
     @Test
     public void testWithSupplementary() throws Exception {
-        ArchiveAndCompilationPath compRes = createCompiledJar("a.jar", "v1/supplementary/a/A.java",
-                "v1/supplementary/b/B.java", "v1/supplementary/a/C.java");
+        testWithSupplementaryJar("a.", "sup.", "D", "v1/supplementary/a/A.java", "v1/supplementary/b/B.java",
+                "v1/supplementary/b/D.java", A_PACKAGE_PATH, SUP_PACKAGE_PATH);
+    }
+
+    private void testWithSupplementaryJar(String aPackage, String supPackage, String extraClassName,
+            String aClassSourcePath, String bClassSourcePath, String extraClassSourcePath, String aClassCompiledPath,
+            String supClassCompiledPath) throws Exception {
+        ArchiveAndCompilationPath compRes = createCompiledJar("a.jar", aClassSourcePath, bClassSourcePath,
+                extraClassSourcePath);
 
-        JavaArchive api = ShrinkWrap.create(JavaArchive.class, "api.jar")
-                .addAsResource(compRes.compilationPath.resolve("A.class").toFile(), "A.class");
+        JavaArchive api = ShrinkWrap.create(JavaArchive.class, "api.jar").addAsResource(
+                compRes.compilationPath.resolve(aClassCompiledPath + "A.class").toFile(),
+                aClassCompiledPath + "A.class");
         JavaArchive sup = ShrinkWrap.create(JavaArchive.class, "sup.jar")
-                .addAsResource(compRes.compilationPath.resolve("B.class").toFile(), "B.class")
-                .addAsResource(compRes.compilationPath.resolve("B$T$1.class").toFile(), "B$T$1.class")
-                .addAsResource(compRes.compilationPath.resolve("B$T$1$TT$1.class").toFile(), "B$T$1$TT$1.class")
-                .addAsResource(compRes.compilationPath.resolve("B$T$2.class").toFile(), "B$T$2.class")
-                .addAsResource(compRes.compilationPath.resolve("C.class").toFile(), "C.class")
-                .addAsResource(compRes.compilationPath.resolve("B$UsedByIgnoredClass.class").toFile(),
-                        "B$UsedByIgnoredClass.class")
-                .addAsResource(compRes.compilationPath.resolve("A$PrivateEnum.class").toFile(), "A$PrivateEnum.class");
+                .addAsResource(compRes.compilationPath.resolve(supClassCompiledPath + "B.class").toFile(),
+                        supClassCompiledPath + "B.class")
+                .addAsResource(compRes.compilationPath.resolve(supClassCompiledPath + "B$T$1.class").toFile(),
+                        supClassCompiledPath + "B$T$1.class")
+                .addAsResource(compRes.compilationPath.resolve(supClassCompiledPath + "B$T$1$TT$1.class").toFile(),
+                        supClassCompiledPath + "B$T$1$TT$1.class")
+                .addAsResource(compRes.compilationPath.resolve(supClassCompiledPath + "B$T$2.class").toFile(),
+                        supClassCompiledPath + "B$T$2.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(supClassCompiledPath + extraClassName + ".class").toFile(),
+                        supClassCompiledPath + extraClassName + ".class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(supClassCompiledPath + "B$UsedByIgnoredClass.class").toFile(),
+                        supClassCompiledPath + "B$UsedByIgnoredClass.class")
+                .addAsResource(compRes.compilationPath.resolve(aClassCompiledPath + "A$PrivateEnum.class").toFile(),
+                        aClassCompiledPath + "A$PrivateEnum.class");
 
         JavaArchiveAnalyzer analyzer = new JavaArchiveAnalyzer(apiAnalyzer,
                 new API(Arrays.asList(new ShrinkwrapArchive(api)), Arrays.asList(new ShrinkwrapArchive(sup))),
@@ -115,12 +148,12 @@ public void testWithSupplementary() throws Exception {
             TypeElement B_T$1 = roots.next().as(TypeElement.class);
             TypeElement B_T$2 = roots.next().as(TypeElement.class);
 
-            Assert.assertEquals("A", A.getCanonicalName());
-            Assert.assertEquals("A", A.getDeclaringElement().getQualifiedName().toString());
-            Assert.assertEquals("B.T$1", B_T$1.getCanonicalName());
-            Assert.assertEquals("B.T$1", B_T$1.getDeclaringElement().getQualifiedName().toString());
-            Assert.assertEquals("B.T$2", B_T$2.getCanonicalName());
-            Assert.assertEquals("B.T$2", B_T$2.getDeclaringElement().getQualifiedName().toString());
+            Assert.assertEquals(aPackage + "A", A.getCanonicalName());
+            Assert.assertEquals(aPackage + "A", A.getDeclaringElement().getQualifiedName().toString());
+            Assert.assertEquals(supPackage + "B.T$1", B_T$1.getCanonicalName());
+            Assert.assertEquals(supPackage + "B.T$1", B_T$1.getDeclaringElement().getQualifiedName().toString());
+            Assert.assertEquals(supPackage + "B.T$2", B_T$2.getCanonicalName());
+            Assert.assertEquals(supPackage + "B.T$2", B_T$2.getDeclaringElement().getQualifiedName().toString());
         } finally {
             deleteDir(compRes.compilationPath);
             analyzer.getCompilationValve().removeCompiledResults();
@@ -173,24 +206,31 @@ public void testTypeParametersDragIntoAPI() throws Exception {
         ArchiveAndCompilationPath compRes = createCompiledJar("a.jar", "misc/Generics.java",
                 "misc/GenericsParams.java");
 
-        JavaArchive api = ShrinkWrap.create(JavaArchive.class, "api.jar")
-                .addAsResource(compRes.compilationPath.resolve("Generics.class").toFile(), "Generics.class");
+        JavaArchive api = ShrinkWrap.create(JavaArchive.class, "api.jar").addAsResource(
+                compRes.compilationPath.resolve(A_PACKAGE_PATH + "Generics.class").toFile(),
+                A_PACKAGE_PATH + "Generics.class");
         JavaArchive sup = ShrinkWrap.create(JavaArchive.class, "sup.jar")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams.class").toFile(), "GenericsParams.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$TypeParam.class").toFile(),
-                        "GenericsParams$TypeParam.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$ExtendsBound.class").toFile(),
-                        "GenericsParams$ExtendsBound.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$SuperBound.class").toFile(),
-                        "GenericsParams$SuperBound.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$TypeVar.class").toFile(),
-                        "GenericsParams$TypeVar.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$TypeVarIface.class").toFile(),
-                        "GenericsParams$TypeVarIface.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$TypeVarImpl.class").toFile(),
-                        "GenericsParams$TypeVarImpl.class")
-                .addAsResource(compRes.compilationPath.resolve("GenericsParams$Unused.class").toFile(),
-                        "GenericsParams$Unused.class");
+                .addAsResource(compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$TypeParam.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams$TypeParam.class")
+                .addAsResource(compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$ExtendsBound.class")
+                        .toFile(), SUP_PACKAGE_PATH + "GenericsParams$ExtendsBound.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$SuperBound.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams$SuperBound.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$TypeVar.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams$TypeVar.class")
+                .addAsResource(compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$TypeVarIface.class")
+                        .toFile(), SUP_PACKAGE_PATH + "GenericsParams$TypeVarIface.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$TypeVarImpl.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams$TypeVarImpl.class")
+                .addAsResource(
+                        compRes.compilationPath.resolve(SUP_PACKAGE_PATH + "GenericsParams$Unused.class").toFile(),
+                        SUP_PACKAGE_PATH + "GenericsParams$Unused.class");
 
         JavaArchiveAnalyzer analyzer = new JavaArchiveAnalyzer(apiAnalyzer,
                 new API(Arrays.asList(new ShrinkwrapArchive(api)), Arrays.asList(new ShrinkwrapArchive(sup))),
@@ -204,14 +244,14 @@ public void testTypeParametersDragIntoAPI() throws Exception {
 
             Assert.assertEquals(7, roots.size());
             Assert.assertTrue(roots.stream().anyMatch(hasName(
-                    "class Generics<T extends GenericsParams.TypeVar & GenericsParams.TypeVarIface, U extends Generics<GenericsParams.TypeVarImpl, ?>>")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("class GenericsParams.ExtendsBound")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("class GenericsParams.SuperBound")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("class GenericsParams.TypeParam")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("class GenericsParams.TypeVar")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("interface GenericsParams.TypeVarIface")));
-            Assert.assertTrue(roots.stream().anyMatch(hasName("class GenericsParams.TypeVarImpl")));
-            Assert.assertFalse(roots.stream().anyMatch(hasName("class GenericsParams.Unused")));
+                    "class a.Generics<T extends sup.GenericsParams.TypeVar & sup.GenericsParams.TypeVarIface, U extends a.Generics<sup.GenericsParams.TypeVarImpl, ?>>")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("class sup.GenericsParams.ExtendsBound")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("class sup.GenericsParams.SuperBound")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("class sup.GenericsParams.TypeParam")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("class sup.GenericsParams.TypeVar")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("interface sup.GenericsParams.TypeVarIface")));
+            Assert.assertTrue(roots.stream().anyMatch(hasName("class sup.GenericsParams.TypeVarImpl")));
+            Assert.assertFalse(roots.stream().anyMatch(hasName("class sup.GenericsParams.Unused")));
         } finally {
             deleteDir(compRes.compilationPath);
             analyzer.getCompilationValve().removeCompiledResults();
@@ -369,4 +409,13 @@ public void testProtectedMembersOfFinalClassNotInApi() throws Exception {
     private Predicate<TypeElement> hasName(String name) {
         return t -> name.equals(t.getFullHumanReadableString());
     }
+
+    private int getMajorJavaVersion(String javaVersion) {
+        // Java versions before 9 have "1.x.0_xx", Java 9+ has "9.x.x"
+        if (javaVersion.startsWith("1.")) {
+            return parseInt(javaVersion.split("\\.")[1]);
+        } else {
+            return parseInt(javaVersion.split("\\.")[0]);
+        }
+    }
 }
diff --git a/revapi-java/src/test/java/org/revapi/java/MissingClassReportingTest.java b/revapi-java/src/test/java/org/revapi/java/MissingClassReportingTest.java
index d62dc3980..ca1666983 100644
--- a/revapi-java/src/test/java/org/revapi/java/MissingClassReportingTest.java
+++ b/revapi-java/src/test/java/org/revapi/java/MissingClassReportingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,6 +45,9 @@
  */
 public class MissingClassReportingTest extends AbstractJavaElementAnalyzerTest {
 
+    public static final String A_PACKAGE_PATH = "a/";
+    public static final String SUPER_TYPE_PACKAGE_PATH = "superType/";
+
     private JavaArchive apiV1;
     private JavaArchive apiV2;
 
@@ -63,15 +66,15 @@ private void compileJars() throws Exception {
         // We then check that types from such supplementary jar that the API jar "leaks" by exposing them as types
         // in public/protected fields/methods/method params are then considered the part of the API during api checks.
 
-        apiV1 = ShrinkWrap.create(JavaArchive.class, "apiV1.jar")
-                .addAsResource(compRes1.compilationPath.resolve("A.class").toFile(), "A.class");
+        apiV1 = ShrinkWrap.create(JavaArchive.class, "apiV1.jar").addAsResource(
+                compRes1.compilationPath.resolve(A_PACKAGE_PATH + "A.class").toFile(), A_PACKAGE_PATH + "A.class");
 
         // now do the same for v2
         AbstractJavaElementAnalyzerTest.ArchiveAndCompilationPath compRes2 = createCompiledJar("tmp2",
                 "v2/supplementary/a/A.java", "v2/supplementary/b/B.java", "v2/supplementary/a/C.java");
 
-        apiV2 = ShrinkWrap.create(JavaArchive.class, "apiV2.jar")
-                .addAsResource(compRes2.compilationPath.resolve("A.class").toFile(), "A.class");
+        apiV2 = ShrinkWrap.create(JavaArchive.class, "apiV2.jar").addAsResource(
+                compRes2.compilationPath.resolve(A_PACKAGE_PATH + "A.class").toFile(), A_PACKAGE_PATH + "A.class");
 
         compilationPaths = Arrays.asList(compRes1.compilationPath, compRes2.compilationPath);
     }
@@ -119,12 +122,13 @@ public void testReportsMissingClasses() throws Exception {
                 .getReports();
 
         Assert.assertEquals(3, allReports.size());
-        Assert.assertTrue(containsDifference(allReports, "missing-class B.T$2", "missing-class B.T$2",
+        Assert.assertTrue(containsDifference(allReports, "missing-class sup.B.T$2", "missing-class sup.B.T$2",
                 Code.MISSING_IN_NEW_API.code()));
-        Assert.assertTrue(containsDifference(allReports, "missing-class B.T$2", "missing-class B.T$2",
+        Assert.assertTrue(containsDifference(allReports, "missing-class sup.B.T$2", "missing-class sup.B.T$2",
                 Code.MISSING_IN_OLD_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "missing-class B.T$3", Code.MISSING_IN_NEW_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(
+                containsDifference(allReports, null, "missing-class sup.B.T$3", Code.MISSING_IN_NEW_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
 
         boolean containsMissingOld = false;
         boolean containsMissingNew = false;
@@ -157,7 +161,7 @@ public void testIgnoresMissingClasses() throws Exception {
         List<Report> allReports = res.getExtensions().getFirstExtension(CollectingReporter.class, null).getReports();
 
         Assert.assertEquals(1, allReports.size());
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
     }
 
     @Test
@@ -171,10 +175,13 @@ public void testReportMissingSuperType() throws Exception {
                     "v2/supplementary/superType/B.java");
 
             JavaArchive a1 = ShrinkWrap.create(JavaArchive.class, "superTypeV1.jar")
-                    .addAsResource(v1.compilationPath.resolve("A.class").toFile(), "A.class")
-                    .addAsResource(v1.compilationPath.resolve("B.class").toFile(), "B.class");
-            JavaArchive a2 = ShrinkWrap.create(JavaArchive.class, "superTypeV2.jar")
-                    .addAsResource(v2.compilationPath.resolve("B.class").toFile(), "B.class");
+                    .addAsResource(v1.compilationPath.resolve(SUPER_TYPE_PACKAGE_PATH + "A.class").toFile(),
+                            SUPER_TYPE_PACKAGE_PATH + "A.class")
+                    .addAsResource(v1.compilationPath.resolve(SUPER_TYPE_PACKAGE_PATH + "B.class").toFile(),
+                            SUPER_TYPE_PACKAGE_PATH + "B.class");
+            JavaArchive a2 = ShrinkWrap.create(JavaArchive.class, "superTypeV2.jar").addAsResource(
+                    v2.compilationPath.resolve(SUPER_TYPE_PACKAGE_PATH + "B.class").toFile(),
+                    SUPER_TYPE_PACKAGE_PATH + "B.class");
 
             API oldApi = API.of(new ShrinkwrapArchive(a1)).build();
             API newApi = API.of(new ShrinkwrapArchive(a2)).build();
@@ -186,16 +193,18 @@ public void testReportMissingSuperType() throws Exception {
                     .getReports();
 
             Assert.assertEquals(2, allReports.size());
-            Assert.assertTrue(containsDifference(allReports, "class B", "class B", Code.MISSING_NEW_SUPERTYPE.code()));
-            Assert.assertTrue(containsDifference(allReports, "class A", null, Code.CLASS_REMOVED.code()));
+            Assert.assertTrue(containsDifference(allReports, "class superType.B", "class superType.B",
+                    Code.MISSING_NEW_SUPERTYPE.code()));
+            Assert.assertTrue(containsDifference(allReports, "class superType.A", null, Code.CLASS_REMOVED.code()));
 
             res = revapi.analyze(AnalysisContext.builder().withOldAPI(newApi).withNewAPI(oldApi).build());
 
             allReports = res.getExtensions().getFirstExtension(CollectingReporter.class, null).getReports();
 
             Assert.assertEquals(2, allReports.size());
-            Assert.assertTrue(containsDifference(allReports, "class B", "class B", Code.MISSING_OLD_SUPERTYPE.code()));
-            Assert.assertTrue(containsDifference(allReports, null, "class A", Code.CLASS_ADDED.code()));
+            Assert.assertTrue(containsDifference(allReports, "class superType.B", "class superType.B",
+                    Code.MISSING_OLD_SUPERTYPE.code()));
+            Assert.assertTrue(containsDifference(allReports, null, "class superType.A", Code.CLASS_ADDED.code()));
         } finally {
             compilationPaths = new ArrayList<>(compilationPaths);
             if (v1 != null) {
@@ -221,7 +230,7 @@ public void testMissingClassFiltering() throws Exception {
                 .getReports();
 
         Assert.assertEquals(1, allReports.size());
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
     }
 
     @Test
diff --git a/revapi-java/src/test/java/org/revapi/java/SupplementaryJarsTest.java b/revapi-java/src/test/java/org/revapi/java/SupplementaryJarsTest.java
index aecda19be..d77a739b3 100644
--- a/revapi-java/src/test/java/org/revapi/java/SupplementaryJarsTest.java
+++ b/revapi-java/src/test/java/org/revapi/java/SupplementaryJarsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2023 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -46,6 +46,9 @@ public class SupplementaryJarsTest extends AbstractJavaElementAnalyzerTest {
     private JavaArchive supV1;
     private JavaArchive supV2;
 
+    public static final String A_PACKAGE_PATH = "a/";
+    public static final String SUP_PACKAGE_PATH = "sup/";
+
     @Before
     public void compile() throws Exception {
         // compile all the classes we need in 1 go
@@ -59,40 +62,60 @@ public void compile() throws Exception {
         // in public/protected fields/methods/method params are then considered the part of the API during api checks.
 
         apiV1 = ShrinkWrap.create(JavaArchive.class, "apiV1.jar")
-                .addAsResource(compRes1.compilationPath.resolve("A.class").toFile(), "A.class")
-                .addAsResource(compRes1.compilationPath.resolve("C.class").toFile(), "C.class");
+                .addAsResource(compRes1.compilationPath.resolve(A_PACKAGE_PATH + "A.class").toFile(),
+                        A_PACKAGE_PATH + "A.class")
+                .addAsResource(compRes1.compilationPath.resolve(A_PACKAGE_PATH + "C.class").toFile(),
+                        A_PACKAGE_PATH + "C.class")
+                .addAsResource(compRes1.compilationPath.resolve(A_PACKAGE_PATH + "A$PrivateEnum.class").toFile(),
+                        A_PACKAGE_PATH + "A$PrivateEnum.class");
 
         supV1 = ShrinkWrap.create(JavaArchive.class, "supV1.jar")
-                .addAsResource(compRes1.compilationPath.resolve("B.class").toFile(), "B.class")
-                .addAsResource(compRes1.compilationPath.resolve("B$T$1.class").toFile(), "B$T$1.class")
-                .addAsResource(compRes1.compilationPath.resolve("B$T$1$TT$1.class").toFile(), "B$T$1$TT$1.class")
-                .addAsResource(compRes1.compilationPath.resolve("B$T$2.class").toFile(), "B$T$2.class")
-                .addAsResource(compRes1.compilationPath.resolve("B$UsedByIgnoredClass.class").toFile(),
-                        "B$UsedByIgnoredClass.class")
-                .addAsResource(compRes1.compilationPath.resolve("A$PrivateEnum.class").toFile(), "A$PrivateEnum.class");
+                .addAsResource(compRes1.compilationPath.resolve(SUP_PACKAGE_PATH + "B.class").toFile(),
+                        SUP_PACKAGE_PATH + "B.class")
+                .addAsResource(compRes1.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$1.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$1.class")
+                .addAsResource(compRes1.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$1$TT$1.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$1$TT$1.class")
+                .addAsResource(compRes1.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$2.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$2.class")
+                .addAsResource(
+                        compRes1.compilationPath.resolve(SUP_PACKAGE_PATH + "B$UsedByIgnoredClass.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$UsedByIgnoredClass.class");
 
         // now do the same for v2
         compRes2 = createCompiledJar("tmp2", "v2/supplementary/a/A.java", "v2/supplementary/b/B.java",
                 "v2/supplementary/a/C.java");
 
         apiV2 = ShrinkWrap.create(JavaArchive.class, "apiV2.jar")
-                .addAsResource(compRes2.compilationPath.resolve("A.class").toFile(), "A.class")
-                .addAsResource(compRes2.compilationPath.resolve("C.class").toFile(), "C.class");
+                .addAsResource(compRes2.compilationPath.resolve(A_PACKAGE_PATH + "A.class").toFile(),
+                        A_PACKAGE_PATH + "A.class")
+                .addAsResource(compRes2.compilationPath.resolve(A_PACKAGE_PATH + "C.class").toFile(),
+                        A_PACKAGE_PATH + "C.class")
+                .addAsResource(compRes2.compilationPath.resolve(A_PACKAGE_PATH + "A$PrivateEnum.class").toFile(),
+                        A_PACKAGE_PATH + "A$PrivateEnum.class");
         supV2 = ShrinkWrap.create(JavaArchive.class, "supV2.jar")
-                .addAsResource(compRes2.compilationPath.resolve("B.class").toFile(), "B.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$T$1.class").toFile(), "B$T$1.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$T$1$TT$1.class").toFile(), "B$T$1$TT$1.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$T$2.class").toFile(), "B$T$2.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$T$1$Private.class").toFile(), "B$T$1$Private.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$T$3.class").toFile(), "B$T$3.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$PrivateSuperClass.class").toFile(),
-                        "B$PrivateSuperClass.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$PrivateUsedClass.class").toFile(),
-                        "B$PrivateUsedClass.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$UsedByIgnoredClass.class").toFile(),
-                        "B$UsedByIgnoredClass.class")
-                .addAsResource(compRes2.compilationPath.resolve("A$PrivateEnum.class").toFile(), "A$PrivateEnum.class")
-                .addAsResource(compRes2.compilationPath.resolve("B$PrivateBase.class").toFile(), "B$PrivateBase.class");
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B.class").toFile(),
+                        SUP_PACKAGE_PATH + "B.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$1.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$1.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$1$TT$1.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$1$TT$1.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$2.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$2.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$1$Private.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$1$Private.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$T$3.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$T$3.class")
+                .addAsResource(
+                        compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$PrivateSuperClass.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$PrivateSuperClass.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$PrivateUsedClass.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$PrivateUsedClass.class")
+                .addAsResource(
+                        compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$UsedByIgnoredClass.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$UsedByIgnoredClass.class")
+                .addAsResource(compRes2.compilationPath.resolve(SUP_PACKAGE_PATH + "B$PrivateBase.class").toFile(),
+                        SUP_PACKAGE_PATH + "B$PrivateBase.class");
     }
 
     @After
@@ -118,20 +141,21 @@ public void testSupplementaryJarsAreTakenIntoAccountWhenComputingAPI() throws Ex
         }
 
         Assert.assertEquals(8, allReports.size());
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.T$1.Private",
+                Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field sup.B.T$2.f2", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
         Assert.assertTrue(
-                containsDifference(allReports, null, "class B.T$1.Private", Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field B.T$2.f2", Code.FIELD_ADDED.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
-        Assert.assertTrue(containsDifference(allReports, "class B.T$2", "class B.T$2", Code.CLASS_NOW_FINAL.code()));
-        Assert.assertTrue(
-                containsDifference(allReports, null, "class B.T$3", Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "class B.PrivateUsedClass",
+                containsDifference(allReports, "class sup.B.T$2", "class sup.B.T$2", Code.CLASS_NOW_FINAL.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.T$3",
+                Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.PrivateUsedClass",
                 Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertTrue(containsDifference(allReports, "class B.UsedByIgnoredClass", "interface B.UsedByIgnoredClass",
-                Code.CLASS_KIND_CHANGED.code()));
-        Assert.assertTrue(containsDifference(allReports, "class B.UsedByIgnoredClass", "interface B.UsedByIgnoredClass",
-                Code.CLASS_NOW_ABSTRACT.code()));
-        Assert.assertTrue(containsDifference(allReports, "method void B.UsedByIgnoredClass::<init>()", null,
+        Assert.assertTrue(containsDifference(allReports, "class sup.B.UsedByIgnoredClass",
+                "interface sup.B.UsedByIgnoredClass", Code.CLASS_KIND_CHANGED.code()));
+        Assert.assertTrue(containsDifference(allReports, "class sup.B.UsedByIgnoredClass",
+                "interface sup.B.UsedByIgnoredClass", Code.CLASS_NOW_ABSTRACT.code()));
+        Assert.assertTrue(containsDifference(allReports, "method void sup.B.UsedByIgnoredClass::<init>()", null,
                 Code.METHOD_REMOVED.code()));
     }
 
@@ -144,7 +168,7 @@ public void testExcludedClassesDontDragUsedTypesIntoAPI() throws Exception {
                 .withOldAPI(API.of(new ShrinkwrapArchive(apiV1)).supportedBy(new ShrinkwrapArchive(supV1)).build())
                 .withNewAPI(API.of(new ShrinkwrapArchive(apiV2)).supportedBy(new ShrinkwrapArchive(supV2)).build())
                 .withConfigurationFromJSON("{\"revapi\": {\"filter\": {"
-                        + "\"elements\": {\"exclude\": [{\"matcher\": \"java\", \"match\": \"class C {}\"}]}}}}")
+                        + "\"elements\": {\"exclude\": [{\"matcher\": \"java\", \"match\": \"class a.C {}\"}]}}}}")
                 .build();
 
         try (AnalysisResult res = revapi.analyze(ctx)) {
@@ -153,18 +177,19 @@ public void testExcludedClassesDontDragUsedTypesIntoAPI() throws Exception {
         }
 
         Assert.assertEquals(6, allReports.size());
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.T$1.Private",
+                Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field sup.B.T$2.f2", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
         Assert.assertTrue(
-                containsDifference(allReports, null, "class B.T$1.Private", Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field B.T$2.f2", Code.FIELD_ADDED.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
-        Assert.assertTrue(containsDifference(allReports, "class B.T$2", "class B.T$2", Code.CLASS_NOW_FINAL.code()));
-        Assert.assertTrue(
-                containsDifference(allReports, null, "class B.T$3", Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "class B.PrivateUsedClass",
+                containsDifference(allReports, "class sup.B.T$2", "class sup.B.T$2", Code.CLASS_NOW_FINAL.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.T$3",
+                Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.PrivateUsedClass",
                 Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertFalse(containsDifference(allReports, "class B.UsedByIgnoredClass", "class B.UsedByIgnoredClass",
-                Code.CLASS_KIND_CHANGED.code()));
-        Assert.assertFalse(containsDifference(allReports, "method void B.UsedByIgnoredClass::<init>()", null,
+        Assert.assertFalse(containsDifference(allReports, "class sup.B.UsedByIgnoredClass",
+                "class sup.B.UsedByIgnoredClass", Code.CLASS_KIND_CHANGED.code()));
+        Assert.assertFalse(containsDifference(allReports, "method void sup.B.UsedByIgnoredClass::<init>()", null,
                 Code.METHOD_REMOVED.code()));
     }
 
@@ -178,7 +203,7 @@ public void testExcludedClassesInAPI() throws Exception {
                 .withOldAPI(API.of(new ShrinkwrapArchive(apiV1)).supportedBy(new ShrinkwrapArchive(supV1)).build())
                 .withNewAPI(API.of(new ShrinkwrapArchive(apiV2)).supportedBy(new ShrinkwrapArchive(supV2)).build())
                 .withConfigurationFromJSON("{\"revapi\": {"
-                        + "\"filter\": {\"elements\": {\"exclude\": [{\"matcher\": \"java\", \"match\": \"match %c | %b; class %c=C {} class %b=B.T$2 {}\"}]}}}}")
+                        + "\"filter\": {\"elements\": {\"exclude\": [{\"matcher\": \"java\", \"match\": \"match %c | %b; class %c=a.C {} class %b=sup.B.T$2 {}\"}]}}}}")
                 .build();
 
         try (AnalysisResult res = revapi.analyze(ctx)) {
@@ -187,18 +212,19 @@ public void testExcludedClassesInAPI() throws Exception {
         }
 
         Assert.assertEquals(3, allReports.size());
+        Assert.assertFalse(containsDifference(allReports, null, "class sup.B.T$1.Private",
+                Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
+        Assert.assertFalse(containsDifference(allReports, null, "field sup.B.T$2.f2", Code.FIELD_ADDED.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "field a.A.f3", Code.FIELD_ADDED.code()));
         Assert.assertFalse(
-                containsDifference(allReports, null, "class B.T$1.Private", Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertFalse(containsDifference(allReports, null, "field B.T$2.f2", Code.FIELD_ADDED.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "field A.f3", Code.FIELD_ADDED.code()));
-        Assert.assertFalse(containsDifference(allReports, "class B.T$2", "class B.T$2", Code.CLASS_NOW_FINAL.code()));
-        Assert.assertTrue(
-                containsDifference(allReports, null, "class B.T$3", Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
-        Assert.assertTrue(containsDifference(allReports, null, "class B.PrivateUsedClass",
+                containsDifference(allReports, "classa. B.T$2", "class sup.B.T$2", Code.CLASS_NOW_FINAL.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.T$3",
+                Code.CLASS_EXTERNAL_CLASS_EXPOSED_IN_API.code()));
+        Assert.assertTrue(containsDifference(allReports, null, "class sup.B.PrivateUsedClass",
                 Code.CLASS_NON_PUBLIC_PART_OF_API.code()));
-        Assert.assertFalse(containsDifference(allReports, "class B.UsedByIgnoredClass", "class B.UsedByIgnoredClass",
-                Code.CLASS_KIND_CHANGED.code()));
-        Assert.assertFalse(containsDifference(allReports, "method void B.UsedByIgnoredClass::<init>()", null,
+        Assert.assertFalse(containsDifference(allReports, "class sup.B.UsedByIgnoredClass",
+                "class sup.B.UsedByIgnoredClass", Code.CLASS_KIND_CHANGED.code()));
+        Assert.assertFalse(containsDifference(allReports, "method void sup.B.UsedByIgnoredClass::<init>()", null,
                 Code.METHOD_REMOVED.code()));
     }
 }
diff --git a/revapi-java/src/test/resources/java8/v1/supplementary/a/A.java b/revapi-java/src/test/resources/java8/v1/supplementary/a/A.java
new file mode 100644
index 000000000..bd86470f1
--- /dev/null
+++ b/revapi-java/src/test/resources/java8/v1/supplementary/a/A.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+public class A {
+    private B.T$1 f1;
+    public B.T$2 f2;
+
+    //this tests that a public field or method of a private class doesn't move it to API.
+    private enum PrivateEnum {ONE, TWO}
+
+    //this tests missing classes can be used as throws declarations, too
+    public void m() throws B.T$2 {
+
+    }
+}
\ No newline at end of file
diff --git a/revapi-java/src/test/resources/java8/v1/supplementary/a/C.java b/revapi-java/src/test/resources/java8/v1/supplementary/a/C.java
new file mode 100644
index 000000000..f5edadaee
--- /dev/null
+++ b/revapi-java/src/test/resources/java8/v1/supplementary/a/C.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+public class C {
+    public B.UsedByIgnoredClass field;
+}
\ No newline at end of file
diff --git a/revapi-java/src/test/resources/java8/v1/supplementary/b/B.java b/revapi-java/src/test/resources/java8/v1/supplementary/b/B.java
new file mode 100644
index 000000000..c9bc891f4
--- /dev/null
+++ b/revapi-java/src/test/resources/java8/v1/supplementary/b/B.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+public class B {
+
+    public static class UsedByIgnoredClass {}
+
+    public static class T$1 {
+        private static class TT$1 {
+            public static final T$2 f = null;
+        }
+    };
+
+    public static class T$2 extends Exception {
+        public T$1 f;
+    };
+}
\ No newline at end of file
diff --git a/revapi-java/src/test/resources/misc/Generics.java b/revapi-java/src/test/resources/misc/Generics.java
index e6a2ef7a3..d92b1c787 100644
--- a/revapi-java/src/test/resources/misc/Generics.java
+++ b/revapi-java/src/test/resources/misc/Generics.java
@@ -1,3 +1,28 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package a;
+
+import sup.GenericsParams.ExtendsBound;
+import sup.GenericsParams.SuperBound;
+import sup.GenericsParams.TypeVar;
+import sup.GenericsParams.TypeVarIface;
+import sup.GenericsParams.TypeVarImpl;
+import sup.GenericsParams.TypeParam;
+
 /*
  * Copyright 2014-2017 Lukas Krejci
  * and other contributors as indicated by the @author tags.
@@ -14,15 +39,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-public class Generics<T extends GenericsParams.TypeVar & GenericsParams.TypeVarIface, U extends Generics<GenericsParams.TypeVarImpl, ?>> {
+public class Generics<T extends TypeVar & TypeVarIface, U extends Generics<TypeVarImpl, ?>> {
 
-    public java.util.Set<GenericsParams.TypeParam> field;
+    public java.util.Set<TypeParam> field;
 
     public <X extends U> X method1() {return null;}
 
-    public void method2(java.util.Set<? super GenericsParams.SuperBound> x) {}
+    public void method2(java.util.Set<? super SuperBound> x) {}
 
     public <X extends T> X method3() {return null;}
 
-    public <X extends GenericsParams.ExtendsBound> void method4(java.util.Set<X> x) {}
+    public <X extends ExtendsBound> void method4(java.util.Set<X> x) {}
 }
diff --git a/revapi-java/src/test/resources/misc/GenericsParams.java b/revapi-java/src/test/resources/misc/GenericsParams.java
index 2272176d6..ef025dbea 100644
--- a/revapi-java/src/test/resources/misc/GenericsParams.java
+++ b/revapi-java/src/test/resources/misc/GenericsParams.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package sup;
+
 /*
  * Copyright 2014-2017 Lukas Krejci
  * and other contributors as indicated by the @author tags.
diff --git a/revapi-java/src/test/resources/v1/supplementary/a/A.java b/revapi-java/src/test/resources/v1/supplementary/a/A.java
index c53da21a6..817da9505 100644
--- a/revapi-java/src/test/resources/v1/supplementary/a/A.java
+++ b/revapi-java/src/test/resources/v1/supplementary/a/A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,15 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package a;
+
 public class A {
-    private B.T$1 f1;
-    public B.T$2 f2;
+    private sup.B.T$1 f1;
+    public sup.B.T$2 f2;
 
     //this tests that a public field or method of a private class doesn't move it to API.
     private enum PrivateEnum {ONE, TWO}
 
     //this tests missing classes can be used as throws declarations, too
-    public void m() throws B.T$2 {
+    public void m() throws sup.B.T$2 {
 
     }
 }
diff --git a/revapi-java/src/test/resources/v1/supplementary/a/C.java b/revapi-java/src/test/resources/v1/supplementary/a/C.java
index 6bde78fe3..5211621a6 100644
--- a/revapi-java/src/test/resources/v1/supplementary/a/C.java
+++ b/revapi-java/src/test/resources/v1/supplementary/a/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package a;
 public class C {
-    public B.UsedByIgnoredClass field;
+    public sup.B.UsedByIgnoredClass field;
 }
diff --git a/revapi-java/src/test/resources/v1/supplementary/b/B.java b/revapi-java/src/test/resources/v1/supplementary/b/B.java
index 48c7033fd..842b29a8d 100644
--- a/revapi-java/src/test/resources/v1/supplementary/b/B.java
+++ b/revapi-java/src/test/resources/v1/supplementary/b/B.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package sup;
+
 public class B {
 
     public static class UsedByIgnoredClass {}
diff --git a/revapi-java/src/test/resources/v1/supplementary/b/D.java b/revapi-java/src/test/resources/v1/supplementary/b/D.java
new file mode 100644
index 000000000..657034a44
--- /dev/null
+++ b/revapi-java/src/test/resources/v1/supplementary/b/D.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package sup;
+public class D {
+    public sup.B.UsedByIgnoredClass field;
+}
diff --git a/revapi-java/src/test/resources/v1/supplementary/superType/A.java b/revapi-java/src/test/resources/v1/supplementary/superType/A.java
index 06966ab42..2fe96249f 100644
--- a/revapi-java/src/test/resources/v1/supplementary/superType/A.java
+++ b/revapi-java/src/test/resources/v1/supplementary/superType/A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package superType;
+
 public class A {
 
-}
+}
\ No newline at end of file
diff --git a/revapi-java/src/test/resources/v1/supplementary/superType/B.java b/revapi-java/src/test/resources/v1/supplementary/superType/B.java
index 74fe1041f..1d5f533b4 100644
--- a/revapi-java/src/test/resources/v1/supplementary/superType/B.java
+++ b/revapi-java/src/test/resources/v1/supplementary/superType/B.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package superType;
+
 public class B extends A {
 
 }
diff --git a/revapi-java/src/test/resources/v2/supplementary/a/A.java b/revapi-java/src/test/resources/v2/supplementary/a/A.java
index 47b2e5087..90dac8467 100644
--- a/revapi-java/src/test/resources/v2/supplementary/a/A.java
+++ b/revapi-java/src/test/resources/v2/supplementary/a/A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,16 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package a;
+
 public class A {
-    private B.T$1 f1;
-    public B.T$2 f2;
-    public B.T$3 f3;
+    private sup.B.T$1 f1;
+    public sup.B.T$2 f2;
+    public sup.B.T$3 f3;
 
     //this tests that a public field or method of a private class doesn't move it to API.
     private enum PrivateEnum {ONE, TWO}
 
     //this tests missing classes can be used as throws declarations, too
-    public void m() throws B.T$2 {
+    public void m() throws sup.B.T$2 {
 
     }
 }
diff --git a/revapi-java/src/test/resources/v2/supplementary/a/C.java b/revapi-java/src/test/resources/v2/supplementary/a/C.java
index 6bde78fe3..5211621a6 100644
--- a/revapi-java/src/test/resources/v2/supplementary/a/C.java
+++ b/revapi-java/src/test/resources/v2/supplementary/a/C.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package a;
 public class C {
-    public B.UsedByIgnoredClass field;
+    public sup.B.UsedByIgnoredClass field;
 }
diff --git a/revapi-java/src/test/resources/v2/supplementary/b/B.java b/revapi-java/src/test/resources/v2/supplementary/b/B.java
index 238bec62e..57a506b85 100644
--- a/revapi-java/src/test/resources/v2/supplementary/b/B.java
+++ b/revapi-java/src/test/resources/v2/supplementary/b/B.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package sup;
+
 public class B {
     /**
      * This changed from class to interface, but if the class C, which uses this, is ignored, we should get no
diff --git a/revapi-java/src/test/resources/v2/supplementary/b/D.java b/revapi-java/src/test/resources/v2/supplementary/b/D.java
new file mode 100644
index 000000000..657034a44
--- /dev/null
+++ b/revapi-java/src/test/resources/v2/supplementary/b/D.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2014-2025 Lukas Krejci
+ * and other contributors as indicated by the @author tags.
+ *
+ * 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
+ *
+ *     http://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.
+ */
+package sup;
+public class D {
+    public sup.B.UsedByIgnoredClass field;
+}
diff --git a/revapi-java/src/test/resources/v2/supplementary/superType/A.java b/revapi-java/src/test/resources/v2/supplementary/superType/A.java
index 06966ab42..1502a3f84 100644
--- a/revapi-java/src/test/resources/v2/supplementary/superType/A.java
+++ b/revapi-java/src/test/resources/v2/supplementary/superType/A.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package superType;
+
 public class A {
 
 }
diff --git a/revapi-java/src/test/resources/v2/supplementary/superType/B.java b/revapi-java/src/test/resources/v2/supplementary/superType/B.java
index bb13db5d8..51c335e2b 100644
--- a/revapi-java/src/test/resources/v2/supplementary/superType/B.java
+++ b/revapi-java/src/test/resources/v2/supplementary/superType/B.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 Lukas Krejci
+ * Copyright 2014-2025 Lukas Krejci
  * and other contributors as indicated by the @author tags.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package superType;
+
 public class B extends A {
     
 }