diff --git a/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala b/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala
index 5f17f1e3d..82dfb3c51 100644
--- a/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala
+++ b/lm-coursier/src/test/scala/lmcoursier/ResolutionSpec.scala
@@ -11,7 +11,7 @@ import sbt.librarymanagement.Resolver.{
   JCenterRepository,
   JavaNet2Repository
 }
-import sbt.librarymanagement.{ Resolver, UnresolvedWarningConfiguration, UpdateConfiguration }
+// import sbt.librarymanagement.{ Resolver, UnresolvedWarningConfiguration, UpdateConfiguration }
 import sbt.librarymanagement.syntax.*
 
 final class ResolutionSpec extends AnyPropSpec with Matchers {
diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
index 1602dc659..cf05ae93c 100644
--- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
+++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
@@ -40,7 +40,6 @@ import scala.collection.immutable.ArraySeq
 import scala.util.{ Success, Failure }
 import sbt.util.*
 import sbt.librarymanagement.{ ModuleDescriptorConfiguration as InlineConfiguration, * }
-import sbt.librarymanagement.Platform
 import sbt.librarymanagement.ivy.*
 import sbt.librarymanagement.syntax.*
 
@@ -54,7 +53,6 @@ import ivyint.{
 }
 import sjsonnew.JsonFormat
 import sjsonnew.support.murmurhash.Hasher
-import sbt.librarymanagement.ModuleSettings
 
 final class IvySbt(
     val configuration: IvyConfiguration,
diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 287c894dd..64bf2dcef 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -139,8 +139,6 @@ import xsbti.compile.{
   TastyFiles,
   TransactionalManagerType
 }
-import sbt.internal.IncrementalTest
-import sbt.internal.RunUtil
 
 object Defaults extends BuildCommon {
   final val CacheDirectoryName = "cache"
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index c8f435522..f464301d0 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -4,7 +4,7 @@ import Keys.*
 object Dependencies {
   // WARNING: Please Scala update versions in PluginCross.scala too
   val scala213 = "2.13.16"
-  val scala3 = "3.6.3"
+  val scala3 = "3.6.4"
   val checkPluginCross = settingKey[Unit]("Make sure scalaVersion match up")
   val baseScalaVersion = scala3
   def nightlyVersion: Option[String] =
diff --git a/sbt-app/src/sbt-test/actions/input-task-dyn/build.sbt b/sbt-app/src/sbt-test/actions/input-task-dyn/build.sbt
index 44542da92..f730e5919 100644
--- a/sbt-app/src/sbt-test/actions/input-task-dyn/build.sbt
+++ b/sbt-app/src/sbt-test/actions/input-task-dyn/build.sbt
@@ -5,7 +5,7 @@ import complete.Parser
 val runFoo = inputKey[Unit]("Runs Foo with passed arguments")
 val check = taskKey[Unit]("")
 
-scalaVersion := "3.6.3"
+scalaVersion := "3.6.4"
 
 lazy val root = (project in file(".")).
   settings(
diff --git a/sbt-app/src/sbt-test/dependency-management/custom-config/pending b/sbt-app/src/sbt-test/dependency-management/custom-config/test
similarity index 100%
rename from sbt-app/src/sbt-test/dependency-management/custom-config/pending
rename to sbt-app/src/sbt-test/dependency-management/custom-config/test
diff --git a/server-test/src/server-test/client/build.sbt b/server-test/src/server-test/client/build.sbt
index 686d2a7a8..36a9a9ab0 100644
--- a/server-test/src/server-test/client/build.sbt
+++ b/server-test/src/server-test/client/build.sbt
@@ -1,4 +1,4 @@
-scalaVersion := "3.6.3"
+scalaVersion := "3.6.4"
 
 TaskKey[Unit]("willSucceed") := println("success")