diff --git a/build.sbt b/build.sbt
index f859d7ee0..a3d213b6a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -455,7 +455,9 @@ lazy val sbtProj = (project in file("sbt"))
     BuildInfoPlugin.buildInfoDefaultSettings,
     addBuildInfoToConfig(Test),
     buildInfoObject in Test := "TestBuildInfo",
-    buildInfoKeys in Test := Seq[BuildInfoKey](fullClasspath in Compile),
+    buildInfoKeys in Test := Seq[BuildInfoKey](
+      BuildInfoKey.map(fullClasspath in Compile) { case (ident, cp) => ident -> cp.files },
+    ),
     connectInput in run in Test := true,
     outputStrategy in run in Test := Some(StdoutOutput),
     fork in Test := true,
diff --git a/sbt/src/test/scala/sbt/RunFromSourceMain.scala b/sbt/src/test/scala/sbt/RunFromSourceMain.scala
index 27cba48fe..6816e24c7 100644
--- a/sbt/src/test/scala/sbt/RunFromSourceMain.scala
+++ b/sbt/src/test/scala/sbt/RunFromSourceMain.scala
@@ -87,11 +87,7 @@ object RunFromSourceMain {
         Nil
       )
 
-      def mainClasspath =
-        buildinfo.TestBuildInfo.fullClasspath.iterator
-          .map(s => file(s.stripPrefix("Attributed(").stripSuffix(")")))
-          .toArray
-
+      def mainClasspath = buildinfo.TestBuildInfo.fullClasspath.toArray
       def loader = new java.net.URLClassLoader(mainClasspath map (_.toURI.toURL), null)
       def entryPoint = classOf[xMain]
       def mainClass = classOf[xMain]