diff --git a/lib/PuppeteerSharp.Tests/TestConstants.cs b/lib/PuppeteerSharp.Tests/TestConstants.cs
index 9f5d5e011..f3053efb9 100644
--- a/lib/PuppeteerSharp.Tests/TestConstants.cs
+++ b/lib/PuppeteerSharp.Tests/TestConstants.cs
@@ -42,7 +42,9 @@ public static class TestConstants
         {
             SlowMo = Convert.ToInt32(Environment.GetEnvironmentVariable("SLOW_MO")),
             HeadlessMode = PuppeteerTestAttribute.Headless,
-            Browser = IsChrome ? SupportedBrowser.Chrome : SupportedBrowser.Firefox,
+            Browser = IsChrome
+                ? PuppeteerTestAttribute.Headless == HeadlessMode.Shell ? SupportedBrowser.ChromeHeadlessShell : SupportedBrowser.Chrome
+                : SupportedBrowser.Firefox,
             EnqueueAsyncMessages = Convert.ToBoolean(Environment.GetEnvironmentVariable("ENQUEUE_ASYNC_MESSAGES") ?? "false"),
             Timeout = 0,
             LogProcess = true,
diff --git a/lib/PuppeteerSharp/Launcher.cs b/lib/PuppeteerSharp/Launcher.cs
index 06bf0fda1..34887cf42 100644
--- a/lib/PuppeteerSharp/Launcher.cs
+++ b/lib/PuppeteerSharp/Launcher.cs
@@ -67,7 +67,7 @@ public async Task<IBrowser> LaunchAsync(LaunchOptions options)
 
             Process = options.Browser switch
             {
-                SupportedBrowser.Chrome or SupportedBrowser.Chromium => new ChromeLauncher(executable, options),
+                SupportedBrowser.Chrome or SupportedBrowser.Chromium or SupportedBrowser.ChromeHeadlessShell => new ChromeLauncher(executable, options),
                 SupportedBrowser.Firefox => new FirefoxLauncher(executable, options),
                 _ => throw new ArgumentException("Invalid browser"),
             };
diff --git a/lib/PuppeteerSharp/PuppeteerSharp.csproj b/lib/PuppeteerSharp/PuppeteerSharp.csproj
index 101f56a79..55b5b2d2c 100644
--- a/lib/PuppeteerSharp/PuppeteerSharp.csproj
+++ b/lib/PuppeteerSharp/PuppeteerSharp.csproj
@@ -12,10 +12,10 @@
     <Description>Headless Browser .NET API</Description>
     <PackageId>PuppeteerSharp</PackageId>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <PackageVersion>20.2.4</PackageVersion>
-    <ReleaseVersion>20.2.4</ReleaseVersion>
-    <AssemblyVersion>20.2.4</AssemblyVersion>
-    <FileVersion>20.2.4</FileVersion>
+    <PackageVersion>20.2.5</PackageVersion>
+    <ReleaseVersion>20.2.5</ReleaseVersion>
+    <AssemblyVersion>20.2.5</AssemblyVersion>
+    <FileVersion>20.2.5</FileVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <StyleCopTreatErrorsAsWarnings>false</StyleCopTreatErrorsAsWarnings>
     <DebugType>embedded</DebugType>