diff --git a/packages/amazonq/.changes/next-release/Feature-a37e21b7-a68f-4554-92c9-9db35c0a3e51.json b/packages/amazonq/.changes/next-release/Feature-a37e21b7-a68f-4554-92c9-9db35c0a3e51.json
new file mode 100644
index 00000000000..22f0b872240
--- /dev/null
+++ b/packages/amazonq/.changes/next-release/Feature-a37e21b7-a68f-4554-92c9-9db35c0a3e51.json
@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "Amazon Q /test, /doc, and /dev capabilities integrated into Agentic coding."
+}
diff --git a/packages/amazonq/src/lsp/chat/commands.ts b/packages/amazonq/src/lsp/chat/commands.ts
index 115118a4ad2..9135be6d8d4 100644
--- a/packages/amazonq/src/lsp/chat/commands.ts
+++ b/packages/amazonq/src/lsp/chat/commands.ts
@@ -8,7 +8,6 @@ import { window } from 'vscode'
 import { AmazonQChatViewProvider } from './webviewProvider'
 import { CodeScanIssue } from 'aws-core-vscode/codewhisperer'
 import { EditorContextExtractor } from 'aws-core-vscode/codewhispererChat'
-import { DefaultAmazonQAppInitContext } from 'aws-core-vscode/amazonq'
 
 /**
  * TODO: Re-enable these once we can figure out which path they're going to live in
@@ -20,13 +19,8 @@ export function registerCommands(provider: AmazonQChatViewProvider) {
         registerGenericCommand('aws.amazonq.refactorCode', 'Refactor', provider),
         registerGenericCommand('aws.amazonq.fixCode', 'Fix', provider),
         registerGenericCommand('aws.amazonq.optimizeCode', 'Optimize', provider),
-        Commands.register('aws.amazonq.generateUnitTests', async () => {
-            DefaultAmazonQAppInitContext.instance.getAppsToWebViewMessagePublisher().publish({
-                sender: 'testChat',
-                command: 'test',
-                type: 'chatMessage',
-            })
-        }),
+        registerGenericCommand('aws.amazonq.generateUnitTests', 'Generate Tests', provider),
+
         Commands.register('aws.amazonq.explainIssue', async (issue: CodeScanIssue) => {
             void focusAmazonQPanel().then(async () => {
                 const editorContextExtractor = new EditorContextExtractor()
diff --git a/packages/amazonq/src/lsp/client.ts b/packages/amazonq/src/lsp/client.ts
index 1cd1ddcf581..df2e29c3149 100644
--- a/packages/amazonq/src/lsp/client.ts
+++ b/packages/amazonq/src/lsp/client.ts
@@ -164,6 +164,7 @@ export async function startLanguageServer(
                         developerProfiles: true,
                         pinnedContextEnabled: true,
                         mcp: true,
+                        reroute: true,
                         modelSelection: true,
                         workspaceFilePath: vscode.workspace.workspaceFile?.fsPath,
                     },
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
index f7bdc6a5089..8500a04911d 100644
--- a/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
+++ b/packages/core/src/amazonq/webview/ui/quickActions/generator.ts
@@ -42,7 +42,6 @@ export class QuickActionGenerator {
         // TODO: Update acc to UX
         const quickActionCommands = [
             {
-                groupName: `Q Developer agentic capabilities`,
                 commands: [
                     ...(this.isFeatureDevEnabled && !this.disabledCommands.includes('/dev')
                         ? [
diff --git a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
index 2b8b9acabd3..6b017e419c0 100644
--- a/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
+++ b/packages/core/src/amazonq/webview/ui/quickActions/handler.ts
@@ -177,15 +177,6 @@ export class QuickActionHandler {
             return
         }
 
-        /**
-         * right click -> generate test has no tab id
-         * we have to manually create one if a testgen tab
-         * wasn't previously created
-         */
-        if (!tabID) {
-            tabID = this.mynahUI.updateStore('', {})
-        }
-
         // if there is no test tab, open a new one
         const affectedTabId: string | undefined = this.addTab(tabID)