diff --git a/packages/amazonq/test/e2e/amazonq/chat.test.ts b/packages/amazonq/test/e2e/amazonq/chat.test.ts
index 71ca13d1764..8c3d5b0f134 100644
--- a/packages/amazonq/test/e2e/amazonq/chat.test.ts
+++ b/packages/amazonq/test/e2e/amazonq/chat.test.ts
@@ -11,7 +11,7 @@ import { MynahUIDataModel } from '@aws/mynah-ui'
 import { assertContextCommands, assertQuickActions } from './assert'
 import { registerAuthHook, using } from 'aws-core-vscode/test'
 import { loginToIdC } from './utils/setup'
-import { helpMessage } from 'aws-core-vscode/amazonq'
+import { webviewConstants } from 'aws-core-vscode/amazonq'
 
 describe('Amazon Q Chat', function () {
     let framework: qTestingFramework
@@ -73,10 +73,10 @@ describe('Amazon Q Chat', function () {
     describe('clicks examples', () => {
         it('click help', async () => {
             tab.clickButton('help')
-            await tab.waitForText(helpMessage)
+            await tab.waitForText(webviewConstants.helpMessage)
             const chatItems = tab.getChatItems()
             assert.deepStrictEqual(chatItems[4].type, 'answer')
-            assert.deepStrictEqual(chatItems[4].body, helpMessage)
+            assert.deepStrictEqual(chatItems[4].body, webviewConstants.helpMessage)
         })
     })
 })
diff --git a/packages/amazonq/test/e2e/amazonq/framework/framework.ts b/packages/amazonq/test/e2e/amazonq/framework/framework.ts
index 37894f96b37..6a29015c06f 100644
--- a/packages/amazonq/test/e2e/amazonq/framework/framework.ts
+++ b/packages/amazonq/test/e2e/amazonq/framework/framework.ts
@@ -29,7 +29,7 @@ export class qTestingFramework {
         featureName: TabType,
         amazonQEnabled: boolean,
         featureConfigsSerialized: [string, FeatureContext][],
-        welcomeCount = 10 // by default don't show the welcome page
+        welcomeCount = Number.MAX_VALUE // by default don't show the welcome page
     ) {
         /**
          * Instantiate the UI and override the postMessage to publish using the app message
diff --git a/packages/core/src/amazonq/index.ts b/packages/core/src/amazonq/index.ts
index 836d7ac91f3..c5abbf7658e 100644
--- a/packages/core/src/amazonq/index.ts
+++ b/packages/core/src/amazonq/index.ts
@@ -25,7 +25,7 @@ export { init as gumbyChatAppInit } from '../amazonqGumby/app'
 export { init as testChatAppInit } from '../amazonqTest/app'
 export { init as docChatAppInit } from '../amazonqDoc/app'
 export { amazonQHelpUrl } from '../shared/constants'
-export * from './webview/ui/texts/constants'
+export * as webviewConstants from './webview/ui/texts/constants'
 export { listCodeWhispererCommandsWalkthrough } from '../codewhisperer/ui/statusBarMenu'
 export { focusAmazonQPanel, focusAmazonQPanelKeybinding } from '../codewhispererChat/commands/registerCommands'
 export { TryChatCodeLensProvider, tryChatCodeLensCommand } from '../codewhispererChat/editor/codelens'