diff --git a/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java b/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java
index 4f9d2bfbcf..72c19d9a31 100644
--- a/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java
+++ b/event/src/main/java/com/facebook/airlift/event/client/HttpEventClient.java
@@ -169,13 +169,12 @@ public Void handle(Request request, Response response)
             try {
                 InputStream inputStream = response.getInputStream();
                 String responseBody = CharStreams.toString(new InputStreamReader(inputStream));
-                log.debug("Posting event to %s failed: status_code=%d status_line=%s body=%s", request.getUri(), statusCode, response.getStatusMessage(), responseBody);
+                log.debug("Posting event to %s failed: status_code=%d body=%s", request.getUri(), statusCode, responseBody);
             }
             catch (IOException bodyError) {
-                log.debug("Posting event to %s failed: status_code=%d status_line=%s error=%s",
+                log.debug("Posting event to %s failed: status_code=%d error=%s",
                         request.getUri(),
                         statusCode,
-                        response.getStatusMessage(),
                         bodyError.getMessage());
             }
             return null;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java
index 40f3da0b0d..25e0710131 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/FullJsonResponseHandler.java
@@ -64,9 +64,9 @@ public JsonResponse<T> handle(Request request, Response response)
         byte[] bytes = readResponseBytes(response);
         String contentType = response.getHeader(CONTENT_TYPE);
         if ((contentType == null) || !MediaType.parse(contentType).is(MEDIA_TYPE_JSON)) {
-            return new JsonResponse<>(response.getStatusCode(), response.getStatusMessage(), response.getHeaders(), bytes);
+            return new JsonResponse<>(response.getStatusCode(), response.getHeaders(), bytes);
         }
-        return new JsonResponse<>(response.getStatusCode(), response.getStatusMessage(), response.getHeaders(), jsonCodec, bytes);
+        return new JsonResponse<>(response.getStatusCode(), response.getHeaders(), jsonCodec, bytes);
     }
 
     private static byte[] readResponseBytes(Response response)
@@ -82,7 +82,6 @@ private static byte[] readResponseBytes(Response response)
     public static class JsonResponse<T>
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
         private final boolean hasValue;
         private final byte[] jsonBytes;
@@ -90,10 +89,9 @@ public static class JsonResponse<T>
         private final T value;
         private final IllegalArgumentException exception;
 
-        public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, byte[] responseBytes)
+        public JsonResponse(int statusCode, ListMultimap<HeaderName, String> headers, byte[] responseBytes)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
 
             this.hasValue = false;
@@ -104,10 +102,9 @@ public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderNam
         }
 
         @SuppressWarnings("ThrowableInstanceNeverThrown")
-        public JsonResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, JsonCodec<T> jsonCodec, byte[] jsonBytes)
+        public JsonResponse(int statusCode, ListMultimap<HeaderName, String> headers, JsonCodec<T> jsonCodec, byte[] jsonBytes)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
 
             this.jsonBytes = requireNonNull(jsonBytes, "jsonBytes is null");
@@ -131,11 +128,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         @Nullable
         public String getHeader(String name)
         {
@@ -201,7 +193,6 @@ public String toString()
         {
             return toStringHelper(this)
                     .add("statusCode", statusCode)
-                    .add("statusMessage", statusMessage)
                     .add("headers", headers)
                     .add("hasValue", hasValue)
                     .add("value", value)
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java
index 1417e32c01..b9bae7a383 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/JsonResponseHandler.java
@@ -68,7 +68,7 @@ public T handle(Request request, Response response)
     {
         if (!successfulResponseCodes.contains(response.getStatusCode())) {
             throw new UnexpectedResponseException(
-                    String.format("Expected response code to be %s, but was %d: %s", successfulResponseCodes, response.getStatusCode(), response.getStatusMessage()),
+                    String.format("Expected response code to be %s, but was %d", successfulResponseCodes, response.getStatusCode()),
                     request,
                     response);
         }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/Response.java b/http-client/src/main/java/com/facebook/airlift/http/client/Response.java
index 1972f718e6..bb6d8f7750 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/Response.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/Response.java
@@ -29,8 +29,6 @@ public interface Response
 {
     int getStatusCode();
 
-    String getStatusMessage();
-
     @Nullable
     default String getHeader(String name)
     {
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java
index 2b69e2cdb4..8969ae94f0 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/StatusResponseHandler.java
@@ -48,19 +48,17 @@ public StatusResponse handleException(Request request, Exception exception)
     @Override
     public StatusResponse handle(Request request, Response response)
     {
-        return new StatusResponse(response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
+        return new StatusResponse(response.getStatusCode(), response.getHeaders());
     }
 
     public static class StatusResponse
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
 
-        public StatusResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)
+        public StatusResponse(int statusCode, ListMultimap<HeaderName, String> headers)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
         }
 
@@ -69,11 +67,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         @Nullable
         public String getHeader(String name)
         {
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java
index f26b6a67c6..9203f6cba7 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/StringResponseHandler.java
@@ -61,14 +61,12 @@ public StringResponse handle(Request request, Response response)
                 MediaType mediaType = MediaType.parse(contentType);
                 return new StringResponse(
                         response.getStatusCode(),
-                        response.getStatusMessage(),
                         response.getHeaders(),
                         new String(ByteStreams.toByteArray(response.getInputStream()), mediaType.charset().or(UTF_8)));
             }
 
             return new StringResponse(
                     response.getStatusCode(),
-                    response.getStatusMessage(),
                     response.getHeaders(),
                     new String(ByteStreams.toByteArray(response.getInputStream()), UTF_8));
         }
@@ -80,14 +78,12 @@ public StringResponse handle(Request request, Response response)
     public static class StringResponse
     {
         private final int statusCode;
-        private final String statusMessage;
         private final ListMultimap<HeaderName, String> headers;
         private final String body;
 
-        public StringResponse(int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers, String body)
+        public StringResponse(int statusCode, ListMultimap<HeaderName, String> headers, String body)
         {
             this.statusCode = statusCode;
-            this.statusMessage = statusMessage;
             this.headers = ImmutableListMultimap.copyOf(headers);
             this.body = body;
         }
@@ -97,11 +93,6 @@ public int getStatusCode()
             return statusCode;
         }
 
-        public String getStatusMessage()
-        {
-            return statusMessage;
-        }
-
         public String getBody()
         {
             return body;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java b/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java
index 7e58057123..3614f34f4d 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/UnexpectedResponseException.java
@@ -31,15 +31,13 @@ public class UnexpectedResponseException
 {
     private final Request request;
     private final int statusCode;
-    private final String statusMessage;
     private final ListMultimap<HeaderName, String> headers;
 
     public UnexpectedResponseException(Request request, Response response)
     {
-        this(String.format("%d: %s", response.getStatusCode(), response.getStatusMessage()),
+        this(String.format("%d", response.getStatusCode()),
                 request,
                 response.getStatusCode(),
-                response.getStatusMessage(),
                 ImmutableListMultimap.copyOf(response.getHeaders()));
     }
 
@@ -48,16 +46,14 @@ public UnexpectedResponseException(String message, Request request, Response res
         this(message,
                 request,
                 response.getStatusCode(),
-                response.getStatusMessage(),
                 ImmutableListMultimap.copyOf(response.getHeaders()));
     }
 
-    public UnexpectedResponseException(String message, Request request, int statusCode, String statusMessage, ListMultimap<HeaderName, String> headers)
+    public UnexpectedResponseException(String message, Request request, int statusCode, ListMultimap<HeaderName, String> headers)
     {
         super(message);
         this.request = request;
         this.statusCode = statusCode;
-        this.statusMessage = statusMessage;
         this.headers = ImmutableListMultimap.copyOf(headers);
     }
 
@@ -66,11 +62,6 @@ public int getStatusCode()
         return statusCode;
     }
 
-    public String getStatusMessage()
-    {
-        return statusMessage;
-    }
-
     @Nullable
     public String getHeader(String name)
     {
@@ -94,7 +85,6 @@ public String toString()
         return toStringHelper(this)
                 .add("request", request)
                 .add("statusCode", statusCode)
-                .add("statusMessage", statusMessage)
                 .add("headers", headers)
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyHttpClient.java b/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyHttpClient.java
index 33ff59fdca..2cabdab0e1 100755
--- a/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyHttpClient.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyHttpClient.java
@@ -157,7 +157,7 @@ public JettyHttpClient(
 
         creationLocation.fillInStackTrace();
 
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         sslContextFactory.setEndpointIdentificationAlgorithm("HTTPS");
         if (config.getKeyStorePath() != null) {
             Optional<KeyStore> pemKeyStore = tryLoadPemKeyStore(config);
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java
index 090bbe4b24..69236a47cc 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/jetty/JettyResponse.java
@@ -31,12 +31,6 @@ public int getStatusCode()
         return response.getStatus();
     }
 
-    @Override
-    public String getStatusMessage()
-    {
-        return response.getReason();
-    }
-
     @Override
     public ListMultimap<HeaderName, String> getHeaders()
     {
@@ -60,7 +54,6 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("statusCode", getStatusCode())
-                .add("statusMessage", getStatusMessage())
                 .add("headers", getHeaders())
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java
index 8cf7eb8f24..4051dc0986 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/testing/TestingResponse.java
@@ -43,12 +43,6 @@ public int getStatusCode()
         return status.code();
     }
 
-    @Override
-    public String getStatusMessage()
-    {
-        return status.reason();
-    }
-
     @Override
     public ListMultimap<HeaderName, String> getHeaders()
     {
@@ -73,7 +67,6 @@ public String toString()
     {
         return toStringHelper(this)
                 .add("statusCode", getStatusCode())
-                .add("statusMessage", getStatusMessage())
                 .add("headers", getHeaders())
                 .toString();
     }
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java
index cc84b791fa..b03f7cf139 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponse.java
@@ -8,12 +8,9 @@
 
 import java.util.List;
 
-import static java.util.Objects.requireNonNull;
-
 public class ThriftResponse<T>
 {
     private final int statusCode;
-    private final String statusMessage;
     private final String errorMessage;
     private final ListMultimap<HeaderName, String> headers;
     private final T value;
@@ -21,14 +18,12 @@ public class ThriftResponse<T>
 
     ThriftResponse(
             int statusCode,
-            String statusMessage,
             String errorMessage,
             ListMultimap<HeaderName, String> headers,
             T value,
             IllegalArgumentException exception)
     {
         this.statusCode = statusCode;
-        this.statusMessage = requireNonNull(statusMessage, "statusMessage is null");
         this.errorMessage = errorMessage;
         this.headers = headers != null ? ImmutableListMultimap.copyOf(headers) : null;
         this.value = value;
@@ -40,11 +35,6 @@ public int getStatusCode()
         return statusCode;
     }
 
-    public String getStatusMessage()
-    {
-        return statusMessage;
-    }
-
     public String getErrorMessage()
     {
         return errorMessage;
diff --git a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java
index 6f8a435204..f28bf91469 100644
--- a/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java
+++ b/http-client/src/main/java/com/facebook/airlift/http/client/thrift/ThriftResponseHandler.java
@@ -69,7 +69,7 @@ public ThriftResponse<T> handle(Request request, Response response)
         catch (Exception e) {
             exception = new IllegalArgumentException("Unable to create " + thriftCodec.getType() + " from THRIFT response", e);
         }
-        return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), null, response.getHeaders(), value, exception);
+        return new ThriftResponse<>(response.getStatusCode(), null, response.getHeaders(), value, exception);
     }
 
     private ThriftResponse<T> createErrorResponse(Response response)
@@ -83,7 +83,7 @@ public InputStream openStream() throws IOException
         };
         try {
             String errorMessage = byteSource.asCharSource(StandardCharsets.UTF_8).read();
-            return new ThriftResponse<>(response.getStatusCode(), response.getStatusMessage(), errorMessage, response.getHeaders(), null, null);
+            return new ThriftResponse<>(response.getStatusCode(), errorMessage, response.getHeaders(), null, null);
         }
         catch (IOException e) {
             throw new UncheckedIOException(e);
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java b/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java
index 50be1d3d0a..f2dce9afe8 100755
--- a/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java
+++ b/http-client/src/test/java/com/facebook/airlift/http/client/AbstractHttpClientTest.java
@@ -140,7 +140,8 @@ public void abstractSetup()
         if (keystore != null) {
             httpConfiguration.addCustomizer(new SecureRequestCustomizer());
 
-            SslContextFactory sslContextFactory = new SslContextFactory(keystore);
+            SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
+            sslContextFactory.setKeyStorePath(keystore);
             sslContextFactory.setKeyStorePassword("changeit");
             SslConnectionFactory sslConnectionFactory = new SslConnectionFactory(sslContextFactory, "http/1.1");
 
@@ -621,27 +622,6 @@ public void testResponseStatusCode()
         assertEquals(statusCode, 543);
     }
 
-    @Test
-    public void testResponseStatusMessage()
-            throws Exception
-    {
-        servlet.setResponseStatusMessage("message");
-
-        Request request = prepareGet()
-                .setUri(baseURI)
-                .build();
-
-        String statusMessage = executeRequest(request, createStatusResponseHandler()).getStatusMessage();
-
-        if (createClientConfig().isHttp2Enabled()) {
-            // reason phrases are not supported in HTTP/2
-            assertNull(statusMessage);
-        }
-        else {
-            assertEquals(statusMessage, "message");
-        }
-    }
-
     @Test
     public void testRequestHeaders()
             throws Exception
@@ -747,7 +727,7 @@ public void testCompressionIsDisabled()
         assertEquals(body, "");
         assertFalse(servlet.getRequestHeaders().containsKey(HeaderName.of(ACCEPT_ENCODING)));
 
-        String json = "{\"foo\":\"bar\",\"hello\":\"world\"}";
+        String json = "{\"fruit\":\"apple\",\"hello\":\"world\"}";
         assertGreaterThanOrEqual(json.length(), GzipHandler.DEFAULT_MIN_GZIP_SIZE);
 
         servlet.setResponseBody(json);
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java b/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java
index be89ff579a..2cb78fb9d5 100644
--- a/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java
+++ b/http-client/src/test/java/com/facebook/airlift/http/client/EchoServlet.java
@@ -42,7 +42,6 @@ public final class EchoServlet
     private byte[] requestBytes;
 
     private int responseStatusCode = 200;
-    private String responseStatusMessage;
     private final ListMultimap<String, String> responseHeaders = ArrayListMultimap.create();
     private String responseBody;
 
@@ -63,12 +62,8 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
 
         requestBytes = ByteStreams.toByteArray(request.getInputStream());
 
-        if (responseStatusMessage != null) {
-            response.sendError(responseStatusCode, responseStatusMessage);
-        }
-        else {
-            response.setStatus(responseStatusCode);
-        }
+        response.setStatus(responseStatusCode);
+
         for (Map.Entry<String, String> entry : responseHeaders.entries()) {
             response.addHeader(entry.getKey(), entry.getValue());
         }
@@ -126,11 +121,6 @@ public void setResponseStatusCode(int responseStatusCode)
         this.responseStatusCode = responseStatusCode;
     }
 
-    public void setResponseStatusMessage(String responseStatusMessage)
-    {
-        this.responseStatusMessage = responseStatusMessage;
-    }
-
     public void addResponseHeader(String name, String value)
     {
         this.responseHeaders.put(name, value);
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/TestHttpClientConfig.java b/http-client/src/test/java/com/facebook/airlift/http/client/TestHttpClientConfig.java
index 8826511c48..7217d8bfd7 100644
--- a/http-client/src/test/java/com/facebook/airlift/http/client/TestHttpClientConfig.java
+++ b/http-client/src/test/java/com/facebook/airlift/http/client/TestHttpClientConfig.java
@@ -212,7 +212,7 @@ public void testValidations()
 
     private List<String> getJettyDefaultExcludedCiphers()
     {
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Client sslContextFactory = new SslContextFactory.Client();
         return Arrays.asList(sslContextFactory.getExcludeCipherSuites());
     }
 }
diff --git a/http-client/src/test/java/com/facebook/airlift/http/client/jetty/TestHttpClientLogger.java b/http-client/src/test/java/com/facebook/airlift/http/client/jetty/TestHttpClientLogger.java
index 5b5040116f..0baf6716ed 100644
--- a/http-client/src/test/java/com/facebook/airlift/http/client/jetty/TestHttpClientLogger.java
+++ b/http-client/src/test/java/com/facebook/airlift/http/client/jetty/TestHttpClientLogger.java
@@ -359,6 +359,18 @@ public Request cookie(HttpCookie cookie)
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public Request tag(Object o)
+        {
+            return null;
+        }
+
+        @Override
+        public Object getTag()
+        {
+            return null;
+        }
+
         @Override
         public Request attribute(String name, Object value)
         {
@@ -539,6 +551,12 @@ public Request onResponseContentAsync(Response.AsyncContentListener listener)
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public Request onResponseContentDemanded(Response.DemandedContentListener demandedContentListener)
+        {
+            return null;
+        }
+
         @Override
         public Request onResponseSuccess(Response.SuccessListener listener)
         {
diff --git a/http-server/src/main/java/com/facebook/airlift/http/server/HttpServer.java b/http-server/src/main/java/com/facebook/airlift/http/server/HttpServer.java
index 9f7ad1a169..afde06d977 100644
--- a/http-server/src/main/java/com/facebook/airlift/http/server/HttpServer.java
+++ b/http-server/src/main/java/com/facebook/airlift/http/server/HttpServer.java
@@ -225,7 +225,7 @@ public HttpServer(HttpServerInfo httpServerInfo,
             HttpConfiguration httpsConfiguration = new HttpConfiguration(baseHttpConfiguration);
             httpsConfiguration.addCustomizer(new SecureRequestCustomizer(config.isSniHostCheck()));
 
-            SslContextFactory sslContextFactory = new SslContextFactory();
+            SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
             Optional<KeyStore> pemKeyStore = tryLoadPemKeyStore(config);
             if (pemKeyStore.isPresent()) {
                 sslContextFactory.setKeyStore(pemKeyStore.get());
@@ -300,7 +300,7 @@ public HttpServer(HttpServerInfo httpServerInfo,
             if (config.isHttpsEnabled()) {
                 adminConfiguration.addCustomizer(new SecureRequestCustomizer());
 
-                SslContextFactory sslContextFactory = new SslContextFactory();
+                SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
                 sslContextFactory.setKeyStorePath(config.getKeystorePath());
                 sslContextFactory.setKeyStorePassword(config.getKeystorePassword());
                 if (config.getKeyManagerPassword() != null) {
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java b/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java
index ee5b0b12b4..d8e9d8ad0d 100644
--- a/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java
+++ b/http-server/src/test/java/com/facebook/airlift/http/server/DummyFilter.java
@@ -44,7 +44,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 
         String requestURI = request.getRequestURI();
         if ("/filter".equals(requestURI)) {
-            response.sendError(HttpServletResponse.SC_PAYMENT_REQUIRED, "filtered");
+            response.sendError(HttpServletResponse.SC_PAYMENT_REQUIRED);
             return;
         }
         chain.doFilter(request, response);
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerCipher.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerCipher.java
index b467046fdf..ad31648121 100644
--- a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerCipher.java
+++ b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerCipher.java
@@ -183,7 +183,7 @@ private HttpServerConfig createHttpServerConfig()
     private static HttpClient createClientIncludeCiphers(String... includedCipherSuites)
             throws Exception
     {
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
         sslContextFactory.setIncludeCipherSuites(includedCipherSuites);
         // Since Jetty 9.4.12 the list of excluded cipher suites includes "^TLS_RSA_.*$" by default.
         // We reset that list here to enable use of those cipher suites.
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerConfig.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerConfig.java
index 559415dd08..066bdb71e0 100644
--- a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerConfig.java
+++ b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerConfig.java
@@ -204,7 +204,7 @@ public void testExplicitPropertyMappings()
 
     private List<String> getJettyDefaultExcludedCiphers()
     {
-        SslContextFactory sslContextFactory = new SslContextFactory();
+        SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
         return Arrays.asList(sslContextFactory.getExcludeCipherSuites());
     }
 }
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java
index e238b7b0ab..d097a4550d 100644
--- a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java
+++ b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerModule.java
@@ -202,7 +202,6 @@ public void testServer()
             response = client.execute(prepareGet().setUri(httpUri.resolve("/filter")).build(), createStatusResponseHandler());
 
             assertEquals(response.getStatusCode(), HttpServletResponse.SC_PAYMENT_REQUIRED);
-            assertEquals(response.getStatusMessage(), "filtered");
 
             // test http resources
             assertResource(httpUri, client, "", "welcome user!");
diff --git a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java
index b9da77f590..d11cb05f31 100644
--- a/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java
+++ b/http-server/src/test/java/com/facebook/airlift/http/server/TestHttpServerProvider.java
@@ -282,7 +282,6 @@ public void testFilter()
             StatusResponse response = client.execute(prepareGet().setUri(httpServerInfo.getHttpUri().resolve("/filter")).build(), createStatusResponseHandler());
 
             assertEquals(response.getStatusCode(), HttpServletResponse.SC_PAYMENT_REQUIRED);
-            assertEquals(response.getStatusMessage(), "filtered");
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 053a9f8006..94ae0aab71 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
 
         <dep.airlift.version>0.214-SNAPSHOT</dep.airlift.version>
         <dep.packaging.version>${dep.airlift.version}</dep.packaging.version>
-        <dep.jetty.version>9.4.14.v20181114</dep.jetty.version>
+        <dep.jetty.version>9.4.55.v20240627</dep.jetty.version>
         <dep.jersey.version>2.26</dep.jersey.version>
         <dep.drift.version>1.31</dep.drift.version>
     </properties>