diff --git a/service/pom.xml b/service/pom.xml
index 3b3e4db42..9cbd9ea5b 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -23,6 +23,7 @@
     <opentelemetry-logback-appender-1.0.version>2.22.0-alpha</opentelemetry-logback-appender-1.0.version>
     <storekit.version>4.0.0</storekit.version>
     <webauthn4j.version>0.30.2.RELEASE</webauthn4j.version>
+    <jetty.http2-client.version>11.0.26</jetty.http2-client.version>
   </properties>
 
   <dependencies>
@@ -137,6 +138,12 @@
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-jetty</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-http-client-transport</artifactId>
+      <scope>test</scope>
+      <version>${jetty.http2-client.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.dropwizard</groupId>
       <artifactId>dropwizard-validation</artifactId>
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/WhisperServerServiceTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/WhisperServerServiceTest.java
index 910017759..011923324 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/WhisperServerServiceTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/WhisperServerServiceTest.java
@@ -24,7 +24,12 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.http2.client.HTTP2Client;
+import org.eclipse.jetty.http2.client.http.HttpClientTransportOverHTTP2;
+import org.eclipse.jetty.io.ClientConnector;
 import org.eclipse.jetty.util.component.LifeCycle;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.StatusCode;
 import org.eclipse.jetty.websocket.client.WebSocketClient;
@@ -34,6 +39,8 @@ import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.whispersystems.textsecuregcm.configuration.OpenTelemetryConfiguration;
 import org.whispersystems.textsecuregcm.metrics.NoopAwsSdkMetricPublisher;
 import org.whispersystems.textsecuregcm.storage.DynamoDbExtension;
@@ -59,7 +66,8 @@ class WhisperServerServiceTest {
         Resources.getResource("config/test-secrets-bundle.yml").getPath());
   }
 
-  private static final WebSocketClient webSocketClient = new WebSocketClient();
+  private static WebSocketClient webSocketClient;
+  private static WebSocketClient h2WebSocketClient;
 
   private static final DropwizardAppExtension<WhisperServerConfiguration> EXTENSION = new DropwizardAppExtension<>(
       WhisperServerService.class, Resources.getResource("config/test.yml").getPath(),
@@ -76,7 +84,13 @@ class WhisperServerServiceTest {
 
   @BeforeAll
   static void setUp() throws Exception {
+    final ClientConnector clientConnector = new ClientConnector();
+    final HTTP2Client http2Client = new HTTP2Client(clientConnector);
+    final HttpClient httpClient = new HttpClient(new HttpClientTransportOverHTTP2(http2Client));
+    h2WebSocketClient = new WebSocketClient(httpClient);
+    webSocketClient = new WebSocketClient();
     webSocketClient.start();
+    h2WebSocketClient.start();
   }
 
   @Test
@@ -100,8 +114,9 @@ class WhisperServerServiceTest {
     assertEquals(200, healthCheck.getStatus());
   }
 
-  @Test
-  void websocket() throws Exception {
+  @ParameterizedTest
+  @ValueSource(booleans = {true, false})
+  void websocket(final boolean useH2) throws Exception {
     // test unauthenticated websocket
     final long start = System.currentTimeMillis();
 
@@ -117,7 +132,7 @@ class WhisperServerServiceTest {
         });
 
     // Session is Closeable, but we intentionally keep it open so that we can confirm the container Lifecycle behavior
-    final Session session = webSocketClient.connect(testWebsocketListener,
+    final Session session = (useH2 ? h2WebSocketClient : webSocketClient).connect(testWebsocketListener,
             URI.create(String.format("ws://localhost:%d/v1/websocket/", EXTENSION.getLocalPort())))
         .join();
     final long sessionTimestamp = Long.parseLong(session.getUpgradeResponse().getHeader(HeaderUtils.TIMESTAMP_HEADER));
diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml
index 9fb5328bd..2771b8daa 100644
--- a/service/src/test/resources/config/test.yml
+++ b/service/src/test/resources/config/test.yml
@@ -536,3 +536,18 @@ callQualitySurvey:
 hlrLookup:
   apiKey: secret://hlrLookup.apiKey
   apiSecret: secret://hlrLookup.apiSecret
+
+server:
+  allowedMethods:
+    - GET
+    - POST
+    - PUT
+    - DELETE
+    - HEAD
+    - OPTIONS
+    - PATCH
+    - CONNECT
+  applicationConnectors:
+    - type: h2c
+      port: 8080
+      useForwardedHeaders: true