diff --git a/packages/core/src/amazonqTest/chat/controller/controller.ts b/packages/core/src/amazonqTest/chat/controller/controller.ts
index 610f9dca5cb..065eeb70297 100644
--- a/packages/core/src/amazonqTest/chat/controller/controller.ts
+++ b/packages/core/src/amazonqTest/chat/controller/controller.ts
@@ -255,6 +255,7 @@ export class TestController {
             result: isCancel ? 'Cancelled' : 'Failed',
             reasonDesc: getTelemetryReasonDesc(data.error),
             isSupportedLanguage: true,
+            credentialStartUrl: AuthUtil.instance.startUrl,
         })
         if (session.stopIteration) {
             // Error from Science
@@ -733,6 +734,7 @@ export class TestController {
             isCodeBlockSelected: session.isCodeBlockSelected,
             perfClientLatency: session.latencyOfTestGeneration,
             isSupportedLanguage: true,
+            credentialStartUrl: AuthUtil.instance.startUrl,
             result: 'Succeeded',
         })
 
@@ -855,6 +857,7 @@ export class TestController {
                 isCodeBlockSelected: session.isCodeBlockSelected,
                 perfClientLatency: session.latencyOfTestGeneration,
                 isSupportedLanguage: true,
+                credentialStartUrl: AuthUtil.instance.startUrl,
                 result: 'Succeeded',
             })
             telemetry.ui_click.emit({ elementId: 'unitTestGeneration_rejectDiff' })
diff --git a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts
index 8636740fa2a..6051a9b51ad 100644
--- a/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts
+++ b/packages/core/src/amazonqTest/chat/controller/messenger/messenger.ts
@@ -36,7 +36,7 @@ import { CodeReference } from '../../../../amazonq/webview/ui/apps/amazonqCommon
 import { getHttpStatusCode, getRequestId, getTelemetryReasonDesc, ToolkitError } from '../../../../shared/errors'
 import { sleep, waitUntil } from '../../../../shared/utilities/timeoutUtils'
 import { keys } from '../../../../shared/utilities/tsUtils'
-import { testGenState } from '../../../../codewhisperer'
+import { AuthUtil, testGenState } from '../../../../codewhisperer'
 import { cancellingProgressField, testGenCompletedField } from '../../../models/constants'
 import { telemetry } from '../../../../shared/telemetry/telemetry'
 
@@ -281,6 +281,7 @@ export class Messenger {
                         result: 'Cancelled',
                         reasonDesc: getTelemetryReasonDesc(CodeWhispererConstants.unitTestGenerationCancelMessage),
                         isSupportedLanguage: false,
+                        credentialStartUrl: AuthUtil.instance.startUrl,
                     })
 
                     this.dispatcher.sendUpdatePromptProgress(
@@ -294,6 +295,7 @@ export class Messenger {
                         perfClientLatency: performance.now() - session.testGenerationStartTime,
                         result: 'Succeeded',
                         isSupportedLanguage: false,
+                        credentialStartUrl: AuthUtil.instance.startUrl,
                     })
                     this.dispatcher.sendUpdatePromptProgress(
                         new UpdatePromptProgressMessage(tabID, testGenCompletedField)