diff --git a/changelog/@unreleased/pr-823.v2.yml b/changelog/@unreleased/pr-823.v2.yml
new file mode 100644
index 000000000..94a216a48
--- /dev/null
+++ b/changelog/@unreleased/pr-823.v2.yml
@@ -0,0 +1,6 @@
+type: fix
+fix:
+  description: Avoid false positives caused by `module-info.class` when checking class
+    uniqueness
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/823
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/ClassUniquenessAnalyzer.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/ClassUniquenessAnalyzer.java
index e2762c682..9fc7ebc7b 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/ClassUniquenessAnalyzer.java
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/tasks/ClassUniquenessAnalyzer.java
@@ -76,7 +76,7 @@ public void analyzeConfiguration(Configuration configuration) {
                         continue;
                     }
 
-                    if (entry.getName().equals("module-info.class")) {
+                    if (entry.getName().contains("module-info.class")) {
                         // Java 9 allows jars to have a module-info.class file in the root,
                         // we shouldn't complain about these.
                         continue;