diff --git a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
index 37756cb7..61fc4cce 100644
--- a/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
+++ b/playwright/src/main/java/com/microsoft/playwright/impl/BrowserContextImpl.java
@@ -225,7 +225,16 @@ class BrowserContextImpl extends ChannelOwner implements BrowserContext {
 
   @Override
   public void setExtraHTTPHeaders(Map<String, String> headers) {
-
+    JsonObject params = new JsonObject();
+    JsonArray jsonHeaders = new JsonArray();
+    for (Map.Entry<String, String> e : headers.entrySet()) {
+      JsonObject header = new JsonObject();
+      header.addProperty("name", e.getKey());
+      header.addProperty("value", e.getValue());
+      jsonHeaders.add(header);
+    }
+    params.add("headers", jsonHeaders);
+    sendMessage("setExtraHTTPHeaders", params);
   }
 
   @Override
diff --git a/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java b/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
new file mode 100644
index 00000000..63a5daf6
--- /dev/null
+++ b/playwright/src/test/java/com/microsoft/playwright/TestPageSetExtraHttpHeaders.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) Microsoft Corporation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.microsoft.playwright;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import static com.microsoft.playwright.Utils.mapOf;
+import static java.util.Arrays.asList;
+import static org.junit.jupiter.api.Assertions.*;
+
+public class TestPageSetExtraHttpHeaders extends TestBase {
+  @Test
+  void shouldWork() throws ExecutionException, InterruptedException {
+    page.setExtraHTTPHeaders(mapOf("foo", "bar"));
+    Future<Server.Request> request = server.waitForRequest("/empty.html");
+    page.navigate(server.EMPTY_PAGE);
+    assertEquals(asList("bar"), request.get().headers.get("foo"));
+    assertNull(request.get().headers.get("baz"));
+  }
+
+  @Test
+  void shouldWorkWithRedirects() throws ExecutionException, InterruptedException {
+    server.setRedirect("/foo.html", "/empty.html");
+    page.setExtraHTTPHeaders(mapOf("foo", "bar"));
+    Future<Server.Request> request = server.waitForRequest("/empty.html");
+    page.navigate(server.PREFIX + "/foo.html");
+    assertEquals(asList("bar"), request.get().headers.get("foo"));
+  }
+
+  @Test
+  void shouldWorkWithExtraHeadersFromBrowserContext() throws ExecutionException, InterruptedException {
+    BrowserContext context = browser.newContext();
+    context.setExtraHTTPHeaders(mapOf("foo", "bar"));
+    Page page = context.newPage();
+    Future<Server.Request> request = server.waitForRequest("/empty.html");
+    page.navigate(server.EMPTY_PAGE);
+    context.close();
+    assertEquals(asList("bar"), request.get().headers.get("foo"));
+  }
+
+  @Test
+  void shouldOverrideExtraHeadersFromBrowserContext() throws ExecutionException, InterruptedException {
+    BrowserContext context = browser.newContext(new Browser.NewContextOptions()
+      .withExtraHTTPHeaders(mapOf("fOo", "bAr", "baR", "foO")));
+    Page page = context.newPage();
+    page.setExtraHTTPHeaders(mapOf("Foo", "Bar"));
+    Future<Server.Request> request = server.waitForRequest("/empty.html");
+    page.navigate(server.EMPTY_PAGE);
+    context.close();
+    assertEquals(asList("Bar"), request.get().headers.get("foo"));
+    assertEquals(asList("foO"), request.get().headers.get("bar"));
+  }
+
+  @Test
+  void shouldThrowForNonStringHeaderValues() {
+    try {
+      browser.newContext(new Browser.NewContextOptions().withExtraHTTPHeaders(mapOf("foo", null)));
+      fail("did not throw");
+    } catch (PlaywrightException e) {
+      System.out.println(e.getMessage());
+      assertTrue(e.getMessage().contains("expected string, got undefined"));
+    }
+  }
+}