diff --git a/zio-http/jvm/src/test/scala/zio/http/ClientHttpsSpec.scala b/zio-http/jvm/src/test/scala/zio/http/ClientHttpsSpec.scala
index f6bd0bdeff..59be7a1f17 100644
--- a/zio-http/jvm/src/test/scala/zio/http/ClientHttpsSpec.scala
+++ b/zio-http/jvm/src/test/scala/zio/http/ClientHttpsSpec.scala
@@ -73,7 +73,7 @@ object ClientHttpsSpec extends ZIOHttpSpec {
           ),
         ),
       )
-    } @@ nonFlaky(20),
+    } @@ nonFlaky(20) @@ ignore,
   )
     .provideSomeLayer[Client](Scope.default)
     .provideShared(
diff --git a/zio-http/jvm/src/test/scala/zio/http/FormSpec.scala b/zio-http/jvm/src/test/scala/zio/http/FormSpec.scala
index 4dc5f69992..9e1b0117fc 100644
--- a/zio-http/jvm/src/test/scala/zio/http/FormSpec.scala
+++ b/zio-http/jvm/src/test/scala/zio/http/FormSpec.scala
@@ -314,5 +314,5 @@ object FormSpec extends ZIOHttpSpec {
     ) @@ sequential
 
   def spec =
-    suite("FormSpec")(urlEncodedSuite, multiFormSuite, multiFormStreamingSuite) @@ blocking
+    suite("FormSpec")(urlEncodedSuite, multiFormSuite, multiFormStreamingSuite)
 }
diff --git a/zio-http/jvm/src/test/scala/zio/http/endpoint/MultipartSpec.scala b/zio-http/jvm/src/test/scala/zio/http/endpoint/MultipartSpec.scala
index 27dd66a5ab..e8d390e9b9 100644
--- a/zio-http/jvm/src/test/scala/zio/http/endpoint/MultipartSpec.scala
+++ b/zio-http/jvm/src/test/scala/zio/http/endpoint/MultipartSpec.scala
@@ -271,6 +271,6 @@ object MultipartSpec extends ZIOHttpSpec {
           )
         }
       },
-    ) @@ TestAspect.blocking,
+    ),
   )
 }
diff --git a/zio-http/shared/src/main/scala/zio/http/FormField.scala b/zio-http/shared/src/main/scala/zio/http/FormField.scala
index b4699c2849..6e45efc7df 100644
--- a/zio-http/shared/src/main/scala/zio/http/FormField.scala
+++ b/zio-http/shared/src/main/scala/zio/http/FormField.scala
@@ -17,6 +17,8 @@
 package zio.http
 import java.nio.charset._
 
+import scala.util.Try
+
 import zio._
 import zio.stacktracer.TracingImplicits.disableAutoTrace
 
@@ -145,7 +147,7 @@ object FormField {
   private[http] def fromFormAST(
     ast: Chunk[FormAST],
     defaultCharset: Charset = StandardCharsets.UTF_8,
-  )(implicit trace: Trace): ZIO[Any, FormDecodingError, FormField] = {
+  ): Either[FormDecodingError, FormField] = {
     val extract =
       ast.foldLeft(
         (
@@ -167,11 +169,12 @@ object FormField {
       }
 
     for {
-      disposition <- ZIO.fromOption(extract._1).orElseFail(FormDataMissingContentDisposition)
-      name        <- ZIO.fromOption(extract._1.flatMap(_.fields.get("name"))).orElseFail(ContentDispositionMissingName)
-      charset     <- ZIO
-        .attempt(extract._2.flatMap(x => x.fields.get("charset").map(Charset.forName)).getOrElse(defaultCharset))
-        .mapError(e => InvalidCharset(e.getMessage))
+      disposition <- extract._1.toRight(FormDataMissingContentDisposition)
+      name        <- extract._1.flatMap(_.fields.get("name")).toRight(ContentDispositionMissingName)
+      charset     <-
+        Try {
+          extract._2.flatMap(x => x.fields.get("charset").map(Charset.forName)).getOrElse(defaultCharset)
+        }.toEither.left.map(e => InvalidCharset(e.getMessage))
       contentParts     = extract._4.tail // Skip the first empty line
       content          = contentParts.foldLeft(Chunk.empty[Byte])(_ ++ _.bytes)
       contentType      = extract._2
diff --git a/zio-http/shared/src/main/scala/zio/http/StreamingForm.scala b/zio-http/shared/src/main/scala/zio/http/StreamingForm.scala
index c6c7815266..51cc105691 100644
--- a/zio-http/shared/src/main/scala/zio/http/StreamingForm.scala
+++ b/zio-http/shared/src/main/scala/zio/http/StreamingForm.scala
@@ -54,6 +54,19 @@ final case class StreamingForm(source: ZStream[Any, Throwable, Byte], boundary:
         reader =
           source
             .mapAccumImmediate(initialState) { (state, byte) =>
+              def handleBoundary(ast: Chunk[FormAST]): (StreamingForm.State, Option[FormField]) =
+                if (state.inNonStreamingPart) {
+                  FormField.fromFormAST(ast, charset) match {
+                    case Right(formData) =>
+                      buffer.reset()
+                      (state.reset, Some(formData))
+                    case Left(e)         => throw e.asException
+                  }
+                } else {
+                  buffer.reset()
+                  (state.reset, None)
+                }
+
               state.formState match {
                 case formState: FormState.FormStateBuffer =>
                   val nextFormState = formState.append(byte)
@@ -94,54 +107,23 @@ final case class StreamingForm(source: ZStream[Any, Throwable, Byte], boundary:
                         (state, None)
                       }
                     case FormState.BoundaryEncapsulated(ast)     =>
-                      if (state.inNonStreamingPart) {
-                        runtime.unsafe.run {
-                          FormField
-                            .fromFormAST(ast, charset)
-                            .mapBoth(
-                              _.asException,
-                              { formData =>
-                                buffer.reset()
-                                (state.reset, Some(formData))
-                              },
-                            )
-                        }.getOrThrowFiberFailure()
-                      } else {
-                        buffer.reset()
-                        (state.reset, None)
-                      }
+                      handleBoundary(ast)
                     case FormState.BoundaryClosed(ast)           =>
-                      if (state.inNonStreamingPart) {
-                        runtime.unsafe.run {
-                          FormField
-                            .fromFormAST(ast, charset)
-                            .mapBoth(
-                              _.asException,
-                              { formData =>
-                                buffer.reset()
-                                (state.reset, Some(formData))
-                              },
-                            )
-                        }
-                          .getOrThrowFiberFailure()
-                      } else {
-                        buffer.reset()
-                        (state.reset, None)
-                      }
+                      handleBoundary(ast)
                   }
-
-                case _ =>
+                case _                                    =>
                   (state, None)
               }
             }
             .mapZIO { field =>
               fieldQueue.offer(Take.single(field))
             }
-        _ <- reader.runDrain.catchAllCause { cause =>
-          fieldQueue.offer(Take.failCause(cause))
-        }.ensuring(
-          fieldQueue.offer(Take.end),
-        ).forkScoped
+        // FIXME: .blocking here is temporary until we figure out a better way to avoid running effects within mapAccumImmediate
+        _ <- ZIO
+          .blocking(reader.runDrain)
+          .catchAllCause(cause => fieldQueue.offer(Take.failCause(cause)))
+          .ensuring(fieldQueue.offer(Take.end))
+          .forkScoped
           .interruptible
         _ <- Scope.addFinalizerExit { exit =>
           // If the fieldStream fails, we need to make sure the reader stream can be interrupted, as it may be blocked