diff --git a/java/gazelle/private/java/java.go b/java/gazelle/private/java/java.go
index 88e6a2c8..70d774b2 100644
--- a/java/gazelle/private/java/java.go
+++ b/java/gazelle/private/java/java.go
@@ -21,7 +21,7 @@ func IsTestPackage(pkg string) bool {
 		}
 	}
 
-	return strings.Contains(pkg, "/test/")
+	return strings.Contains(pkg, "/test/") || strings.HasSuffix(pkg, "/test")
 }
 
 // This list was derived from a script along the lines of:
diff --git a/java/gazelle/private/java/java_test.go b/java/gazelle/private/java/java_test.go
index 4864f75b..a265e4c5 100644
--- a/java/gazelle/private/java/java_test.go
+++ b/java/gazelle/private/java/java_test.go
@@ -18,6 +18,8 @@ func TestIsTestPackage(t *testing.T) {
 		"src/test/java/com/example/myproject":          true,
 		"src/main/com/example/perftest":                false,
 		"test-utils/src/main/com/example/project":      false,
+		"foo/bar/test":                                 true,
+		"project1/testutils/src/main":                  false,
 	}
 
 	for pkg, want := range tests {