diff --git a/src/Playwright.MSTest/BrowserTest.cs b/src/Playwright.MSTest/BrowserTest.cs
index 922f48628..f7ab38338 100644
--- a/src/Playwright.MSTest/BrowserTest.cs
+++ b/src/Playwright.MSTest/BrowserTest.cs
@@ -44,7 +44,7 @@ public async Task<IBrowserContext> NewContextAsync(BrowserNewContextOptions? opt
     [TestInitialize]
     public async Task BrowserSetup()
     {
-        var service = await BrowserService.Register(this, BrowserType, ConnectOptions()).ConfigureAwait(false);
+        var service = await BrowserService.Register(this, BrowserType, await ConnectOptionsAsync()).ConfigureAwait(false);
         Browser = service.Browser;
     }
 
@@ -62,8 +62,8 @@ public async Task BrowserTearDown()
         Browser = null!;
     }
 
-    public virtual PlaywrightConnectOptions? ConnectOptions()
+    public virtual Task<PlaywrightConnectOptions?> ConnectOptionsAsync()
     {
-        return null;
+        return Task.FromResult<PlaywrightConnectOptions?>(null);
     }
 }
diff --git a/src/Playwright.NUnit/BrowserTest.cs b/src/Playwright.NUnit/BrowserTest.cs
index 469194969..7efdcfbaf 100644
--- a/src/Playwright.NUnit/BrowserTest.cs
+++ b/src/Playwright.NUnit/BrowserTest.cs
@@ -43,7 +43,7 @@ public async Task<IBrowserContext> NewContext(BrowserNewContextOptions? options
     [SetUp]
     public async Task BrowserSetup()
     {
-        var service = await BrowserService.Register(this, BrowserType, ConnectOptions()).ConfigureAwait(false);
+        var service = await BrowserService.Register(this, BrowserType, await ConnectOptionsAsync()).ConfigureAwait(false);
         Browser = service.Browser;
     }
 
@@ -61,8 +61,8 @@ public async Task BrowserTearDown()
         Browser = null!;
     }
 
-    public virtual PlaywrightConnectOptions? ConnectOptions()
+    public virtual Task<PlaywrightConnectOptions?> ConnectOptionsAsync()
     {
-        return null;
+        return Task.FromResult<PlaywrightConnectOptions?>(null);
     }
 }
diff --git a/src/Playwright.TestAdapter/PlaywrightConnectOptions.cs b/src/Playwright.TestAdapter/PlaywrightConnectOptions.cs
index be47967e4..881b6d044 100644
--- a/src/Playwright.TestAdapter/PlaywrightConnectOptions.cs
+++ b/src/Playwright.TestAdapter/PlaywrightConnectOptions.cs
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-using Microsoft.Playwright;
+namespace Microsoft.Playwright.TestAdapter;
 
 public class PlaywrightConnectOptions : BrowserTypeConnectOptions
 {
diff --git a/src/Playwright.Xunit/BrowserTest.cs b/src/Playwright.Xunit/BrowserTest.cs
index d6a0acef3..a4b6de758 100644
--- a/src/Playwright.Xunit/BrowserTest.cs
+++ b/src/Playwright.Xunit/BrowserTest.cs
@@ -42,7 +42,7 @@ public async Task<IBrowserContext> NewContext(BrowserNewContextOptions? options
     public override async Task InitializeAsync()
     {
         await base.InitializeAsync().ConfigureAwait(false);
-        var service = await BrowserService.Register(this, BrowserType, ConnectOptions()).ConfigureAwait(false);
+        var service = await BrowserService.Register(this, BrowserType, await ConnectOptionsAsync()).ConfigureAwait(false);
         Browser = service.Browser;
     }
 
@@ -60,8 +60,8 @@ public override async Task DisposeAsync()
         await base.DisposeAsync().ConfigureAwait(false);
     }
 
-    public virtual PlaywrightConnectOptions? ConnectOptions()
+    public virtual Task<PlaywrightConnectOptions?> ConnectOptionsAsync()
     {
-        return null;
+        return Task.FromResult<PlaywrightConnectOptions?>(null);
     }
 }