diff --git a/.changes/next-release/bugfix-f47212d1-8e2b-4c82-9e0d-450ce896e9bc.json b/.changes/next-release/bugfix-f47212d1-8e2b-4c82-9e0d-450ce896e9bc.json
new file mode 100644
index 0000000000..83cfbccbec
--- /dev/null
+++ b/.changes/next-release/bugfix-f47212d1-8e2b-4c82-9e0d-450ce896e9bc.json
@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Amazon Q /test: Fix for test generation payload creation to not filter out target file."
+}
\ No newline at end of file
diff --git a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
index 9abaf0e5d2..9bafb336c2 100644
--- a/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
+++ b/plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonqCodeTest/controller/CodeTestChatController.kt
@@ -277,7 +277,7 @@ class CodeTestChatController(
 
             val requestData = ChatRequestData(
                 tabId = session.tabId,
-                message = "Generate unit tests for the following part of my code: ${message.prompt}",
+                message = "Generate unit tests for the following part of my code: ${message.prompt.ifBlank { fileInfo.fileName }}",
                 activeFileContext = activeFileContext,
                 userIntent = UserIntent.GENERATE_UNIT_TESTS,
                 triggerType = TriggerType.ContextMenu,
diff --git a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt
index 838066a156..136c4d3e43 100644
--- a/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt
+++ b/plugins/amazonq/chat/jetbrains-community/tst/software/aws/toolkits/jetbrains/services/amazonqFeatureDev/FeatureDevSessionContextTest.kt
@@ -75,6 +75,7 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
     @Test
     fun testZipProject() {
         addFilesToProjectModule(
+            ".gitignore",
             ".gradle/cached.jar",
             "src/MyClass.java",
             "gradlew",
@@ -83,6 +84,19 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "settings.gradle",
             "build.gradle",
             "gradle/wrapper/gradle-wrapper.properties",
+            "builder/GetTestBuilder.java", // check for false positives
+            ".aws-sam/build/function1",
+            ".gem/specs.rb",
+            "archive.zip",
+            "output.bin",
+            "images/logo.png",
+            "assets/header.jpg",
+            "icons/menu.svg",
+            "license.txt",
+            "License.md",
+            "node_modules/express",
+            "build/outputs",
+            "dist/bundle.js"
         )
 
         val zipResult = featureDevSessionContext.getProjectZip()
@@ -102,9 +116,10 @@ class FeatureDevSessionContextTest : FeatureDevTestBase(HeavyJavaCodeInsightTest
             "gradlew",
             "gradlew.bat",
             "README.md",
+            "gradle/wrapper/gradle-wrapper.properties",
+            "builder/GetTestBuilder.java",
             "settings.gradle",
             "build.gradle",
-            "gradle/wrapper/gradle-wrapper.properties",
         )
 
         assertTrue(zippedFiles == expectedFiles)
diff --git a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
index e059bcdb0f..b30ed76da5 100644
--- a/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
+++ b/plugins/amazonq/codewhisperer/jetbrains-community/src/software/aws/toolkits/jetbrains/services/codewhisperer/codetest/sessionconfig/CodeTestSessionConfig.kt
@@ -141,7 +141,7 @@ class CodeTestSessionConfig(
         }
 
         // 2. Add the "utgRequiredArtifactsDir" directory
-        val utgDir = "utgRequiredArtifactsDir"
+        val utgDir = "utgRequiredArtifactsDir/" // Note the trailing slash which adds it as a directory and not a file
         LOG.debug { "Adding directory to ZIP: $utgDir" }
         val utgEntry = ZipEntry(utgDir)
         it.putNextEntry(utgEntry)
@@ -150,7 +150,7 @@ class CodeTestSessionConfig(
         val buildAndExecuteLogDir = "buildAndExecuteLogDir"
         val subDirs = listOf(buildAndExecuteLogDir, "repoMapData", "testCoverageDir")
         subDirs.forEach { subDir ->
-            val subDirPathString = Path.of(utgDir, subDir).name
+            val subDirPathString = Path.of(utgDir, subDir).toString() + "/" // Added trailing slash similar to utgRequiredArtifactsDir
             LOG.debug { "Adding empty directory to ZIP: $subDirPathString" }
             val zipEntry = ZipEntry(subDirPathString)
             it.putNextEntry(zipEntry)
@@ -168,6 +168,18 @@ class CodeTestSessionConfig(
         var currentTotalLines = 0L
         val languageCounts = mutableMapOf<CodeWhispererProgrammingLanguage, Int>()
 
+        // Adding Target File to make sure target file doesn't get filtered out.
+        selectedFile?.let { selected ->
+            files.add(selected.path)
+            currentTotalFileSize += selected.length
+            currentTotalLines += countLinesInVirtualFile(selected)
+            selected.programmingLanguage().let { language ->
+                if (language !is CodeWhispererUnknownLanguage) {
+                    languageCounts[language] = (languageCounts[language] ?: 0) + 1
+                }
+            }
+        }
+
         moduleLoop@ for (module in project.modules) {
             val changeListManager = ChangeListManager.getInstance(module.project)
             if (module.guessModuleDir() != null) {
@@ -176,7 +188,8 @@ class CodeTestSessionConfig(
                     val current = stack.pop()
 
                     if (!current.isDirectory) {
-                        if (current.isFile && !changeListManager.isIgnoredFile(current) &&
+                        if (current.isFile && current.path != selectedFile?.path &&
+                            !changeListManager.isIgnoredFile(current) &&
                             runBlocking { !featureDevSessionContext.ignoreFile(current) } &&
                             runReadAction { !fileIndex.isInLibrarySource(current) }
                         ) {
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
index 1dc786b0cf..1005a1d9b4 100644
--- a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
+++ b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/FeatureDevSessionContext.kt
@@ -256,7 +256,6 @@ class FeatureDevSessionContext(val project: Project, val maxProjectSizeBytes: Lo
         .replace(".", "\\.")
         .replace("*", ".*")
         .let { if (it.endsWith("/")) "$it.*" else "$it/.*" } // Add a trailing /* to all patterns. (we add a trailing / to all files when matching)
-
     var selectedSourceFolder: VirtualFile
         set(newRoot) {
             _selectedSourceFolder = newRoot