diff --git a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/MultiPartServletTest.java b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/MultiPartServletTest.java
index f121bb06a50..9109f1c9187 100644
--- a/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/MultiPartServletTest.java
+++ b/jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/MultiPartServletTest.java
@@ -23,6 +23,7 @@ import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
 
@@ -256,9 +257,18 @@ public class MultiPartServletTest
 
         assertThat(writeError, instanceOf(EofException.class));
 
-        // We should get 400 response, for some reason reading the content throws EofException.
-        Response response = listener.get(30, TimeUnit.SECONDS);
-        assertThat(response.getStatus(), equalTo(HttpStatus.BAD_REQUEST_400));
+        // There is a race here, either we fail trying to write some more content OR
+        // we get 400 response, for some reason reading the content throws EofException.
+        try
+        {
+            Response response = listener.get(30, TimeUnit.SECONDS);
+            assertThat(response.getStatus(), equalTo(HttpStatus.BAD_REQUEST_400));
+        }
+        catch (ExecutionException e)
+        {
+            Throwable cause = e.getCause();
+            assertThat(cause, instanceOf(EofException.class));
+        }
     }
 
     @Test
diff --git a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/MultiPartServletTest.java b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/MultiPartServletTest.java
index decbe439399..d1dfea4df6f 100644
--- a/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/MultiPartServletTest.java
+++ b/jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/MultiPartServletTest.java
@@ -20,6 +20,7 @@ import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.zip.GZIPInputStream;
 
@@ -273,9 +274,18 @@ public class MultiPartServletTest
 
         assertThat(writeError, instanceOf(EofException.class));
 
-        // We should get 400 response, for some reason reading the content throws EofException.
-        Response response = listener.get(30, TimeUnit.SECONDS);
-        assertThat(response.getStatus(), equalTo(HttpStatus.BAD_REQUEST_400));
+        // There is a race here, either we fail trying to write some more content OR
+        // we get 400 response, for some reason reading the content throws EofException.
+        try
+        {
+            Response response = listener.get(30, TimeUnit.SECONDS);
+            assertThat(response.getStatus(), equalTo(HttpStatus.BAD_REQUEST_400));
+        }
+        catch (ExecutionException e)
+        {
+            Throwable cause = e.getCause();
+            assertThat(cause, instanceOf(EofException.class));
+        }
     }
 
     @Test