diff --git a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
index e5a8f3bddc4..5a3e2185be7 100644
--- a/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
+++ b/packages/amazonq/test/unit/codewhisperer/util/runtimeLanguageContext.test.ts
@@ -211,9 +211,6 @@ describe('runtimeLanguageContext', function () {
         ]
 
         for (const [inputCwsprLanguageId, expectedCwsprLanguageId] of codewhispererLanguageIds) {
-            if (inputCwsprLanguageId === 'systemVerilog') {
-                console.log()
-            }
             it(`should return ${expectedCwsprLanguageId} if input codewhispererLanguageId is - ${inputCwsprLanguageId}`, function () {
                 const actual = languageContext.toRuntimeLanguage(inputCwsprLanguageId)
                 assert.strictEqual(actual, expectedCwsprLanguageId)
diff --git a/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
index accac63af7a..a8bfb74175b 100644
--- a/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
+++ b/packages/core/src/codewhisperer/util/runtimeLanguageContext.ts
@@ -21,11 +21,17 @@ const runtimeLanguageSet: ReadonlySet<RuntimeLanguage> = new Set([
     'kotlin',
     'php',
     'python',
+    'powershell',
+    'r',
+    'dart',
     'ruby',
     'rust',
     'scala',
     'shell',
     'sql',
+    'swift',
+    'lua',
+    'vue',
     'typescript',
     'json',
     'yaml',