diff --git a/contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala b/contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala
index 9937b7c6919..094f54749ea 100644
--- a/contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala
+++ b/contrib/buildinfo/src/mill/contrib/buildinfo/BuildInfo.scala
@@ -139,8 +139,8 @@ object BuildInfo {
          |public class $buildInfoObjectName {
          |  $bindingsCode
          |
-         |  public static java.util.Map<String, String> toMap() {
-         |    Map<String, String> map = new HashMap<String, String>();
+         |  public static java.util.Map<java.lang.String, java.lang.String> toMap() {
+         |    java.util.Map<java.lang.String, java.lang.String> map = new java.util.HashMap<java.lang.String, java.lang.String>();
          |    $mapEntries
          |    return map;
          |  }
diff --git a/contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala b/contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala
index 4f2e85f2a23..2291242882c 100644
--- a/contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala
+++ b/contrib/buildinfo/test/src/mill/contrib/buildinfo/BuildInfoTests.scala
@@ -207,6 +207,19 @@ object BuildInfoTests extends TestSuite {
       )
     }
 
+    "java-static" - workspaceTest(BuildInfoJavaStatic, "java") { eval =>
+      val runResult = eval.outPath / "hello-mill"
+      val generatedSrc = eval.outPath / "buildInfoSources.dest" / "foo" / "BuildInfo.java"
+      val Right((result, evalCount)) =
+        eval.apply(BuildInfoJavaStatic.run(T.task(Args(runResult.toString))))
+
+      assert(
+        os.exists(runResult),
+        os.exists(generatedSrc),
+        os.read(runResult) == "not-provided-for-java-modules"
+      )
+    }
+
     "generatedSources must be a folder" - workspaceTest(BuildInfoPlain, "scala") { eval =>
       val buildInfoGeneratedSourcesFolder = eval.outPath / "buildInfoSources.dest"
       val Right((result, evalCount)) = eval.apply(BuildInfoPlain.generatedSources)