diff --git a/packages/playwright-core/src/server/chromium/chromium.ts b/packages/playwright-core/src/server/chromium/chromium.ts
index 3791598f5e..203527e92d 100644
--- a/packages/playwright-core/src/server/chromium/chromium.ts
+++ b/packages/playwright-core/src/server/chromium/chromium.ts
@@ -309,7 +309,7 @@ export class Chromium extends BrowserType {
     if (options.devtools)
       chromeArguments.push('--auto-open-devtools-for-tabs');
     if (options.headless) {
-      if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD)
+      if (process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD || options.channel === 'chromium-headless-shell')
         chromeArguments.push('--headless=old');
       else
         chromeArguments.push('--headless=new');
diff --git a/tests/library/browsercontext-credentials.spec.ts b/tests/library/browsercontext-credentials.spec.ts
index 3924c057d0..e4edbdd936 100644
--- a/tests/library/browsercontext-credentials.spec.ts
+++ b/tests/library/browsercontext-credentials.spec.ts
@@ -19,7 +19,9 @@ import { browserTest as base, expect } from '../config/browserTest';
 
 const it = base.extend<{ isChromiumHeadedLike: boolean }>({
   isChromiumHeadedLike: async ({ browserName, headless, channel }, use) => {
-    const isChromiumHeadedLike = browserName === 'chromium' && (!headless || !process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD) && channel !== 'chromium-headless-shell';
+    const isChromiumHeadedLike = browserName === 'chromium'
+      && ((headless && !process.env.PLAYWRIGHT_CHROMIUM_USE_HEADLESS_OLD
+      && channel !== 'chromium-headless-shell') || !headless);
     await use(isChromiumHeadedLike);
   },
 });