diff --git a/build.sbt b/build.sbt
index d4ac37d356..b629dfc39f 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,5 +1,5 @@
 import BuildHelper._
-import Dependencies.{scalafmt, _}
+import Dependencies._
 import sbt.librarymanagement.ScalaArtifacts.isScala3
 import scala.concurrent.duration._
 
@@ -246,7 +246,8 @@ lazy val zioHttpGen = (project in file("zio-http-gen"))
       `zio`,
       `zio-test`,
       `zio-test-sbt`,
-      scalafmt.cross(CrossVersion.for3Use2_13),
+      `scalafmt-dynamic`.cross(CrossVersion.for3Use2_13),
+      `scalafmt-core`.cross(CrossVersion.for3Use2_13),
     ),
   )
   .dependsOn(zioHttp)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index ec159d6f95..627625d4df 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -14,7 +14,8 @@ object Dependencies {
   val `jwt-core`                 = "com.github.jwt-scala"   %% "jwt-core"                % JwtCoreVersion
   val `scala-compact-collection` = "org.scala-lang.modules" %% "scala-collection-compat" % ScalaCompactCollectionVersion
 
-  val scalafmt = "org.scalameta" %% "scalafmt-dynamic" % "3.7.17"
+  val `scalafmt-dynamic` = "org.scalameta" %% "scalafmt-dynamic" % "3.7.17"
+  val `scalafmt-core`    = "org.scalameta" %% "scalafmt-core" % "3.7.17"
 
   val netty =
     Seq(
diff --git a/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala b/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala
index d0d1fcf1a0..ae4d42c267 100644
--- a/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala
+++ b/zio-http-gen/src/test/scala/zio/http/gen/scala/CodeGenSpec.scala
@@ -1,6 +1,5 @@
 package zio.http.gen.scala
 
-import java.io.File
 import java.nio.file._
 
 import scala.jdk.CollectionConverters._
@@ -200,5 +199,5 @@ object CodeGenSpec extends ZIOSpecDefault {
           "/GeneratedPaymentNoDiscriminator.scala",
         )
       },
-    ) @@ java11OrNewer @@ flaky // Downloading scalafmt on CI is flaky
+    ) @@ java11OrNewer
 }