diff --git a/src/main/scala/sbt/internal/ProjectMatrix.scala b/src/main/scala/sbt/internal/ProjectMatrix.scala
index 602773484..83c871721 100644
--- a/src/main/scala/sbt/internal/ProjectMatrix.scala
+++ b/src/main/scala/sbt/internal/ProjectMatrix.scala
@@ -121,7 +121,7 @@ sealed trait ProjectMatrix extends CompositeProject {
   def filterProjects(axisValues: Seq[VirtualAxis]): Seq[Project]
   def filterProjects(autoScalaLibrary: Boolean, axisValues: Seq[VirtualAxis]): Seq[Project]
   def finder(axisValues: VirtualAxis*): ProjectFinder
-  def findAll(): Map[Project, Seq[VirtualAxis]]
+  def allProjects(): Seq[(Project, Seq[VirtualAxis])]
 
   // resolve to the closest match for the given row
   private[sbt] def resolveMatch(thatRow: ProjectMatrix.ProjectRow): ProjectReference
@@ -486,10 +486,10 @@ object ProjectMatrix {
     override def finder(axisValues: VirtualAxis*): ProjectFinder =
       new AxisBaseProjectFinder(axisValues.toSeq)
 
-    override def findAll(): Map[Project, Seq[VirtualAxis]] =
+    override def allProjects(): Seq[(Project, Seq[VirtualAxis])] =
       resolvedMappings.map { case(row, project) =>
         project -> row.axisValues
-      }
+      }.toSeq
 
     def copy(
         id: String = id,
diff --git a/src/sbt-test/projectMatrix/finder/build.sbt b/src/sbt-test/projectMatrix/finder/build.sbt
index d03bdf823..a4e8632c2 100644
--- a/src/sbt-test/projectMatrix/finder/build.sbt
+++ b/src/sbt-test/projectMatrix/finder/build.sbt
@@ -22,8 +22,8 @@ lazy val custom =
   )
 
 check := {
-  val coreResults: Map[Project, Set[VirtualAxis]] = core.findAll().mapValues(_.toSet)
-  val customResults: Map[Project, Set[VirtualAxis]] = custom.findAll().mapValues(_.toSet)
+  val coreResults: Map[Project, Set[VirtualAxis]] = core.allProjects().toMap.mapValues(_.toSet)
+  val customResults: Map[Project, Set[VirtualAxis]] = custom.allProjects().toMap.mapValues(_.toSet)
 
   val isJvm = VirtualAxis.jvm
   val isJs = VirtualAxis.js