diff --git a/tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt b/tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt
index b3521302b81..1d625f4c175 100644
--- a/tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt
+++ b/tests/codegen/smoke-tests/src/test/kotlin/aws/sdk/kotlin/test/codegen/smoketest/SmokeTestE2ETest.kt
@@ -9,7 +9,8 @@ import aws.sdk.kotlin.codegen.smoketests.AWS_SERVICE_FILTER
 import aws.sdk.kotlin.codegen.smoketests.AWS_SKIP_TAGS
 import org.gradle.testkit.runner.GradleRunner
 import java.io.File
-import kotlin.test.*
+import kotlin.test.Test
+import kotlin.test.assertContains
 
 class SmokeTestE2ETest {
     @Test
@@ -65,8 +66,11 @@ private fun runSmokeTests(
 
     val task = GradleRunner.create()
         .withProjectDir(File(sdkRootDir))
-        // FIXME: Remove `-Paws.kotlin.native=false` when Kotlin Native is ready
-        .withArguments("-Paws.kotlin.native=false", ":tests:codegen:smoke-tests:services:$service:smokeTest")
+        .withArguments(
+            "--stacktrace", // Make sure unexpected errors are debuggable
+            "-Paws.kotlin.native=false", // FIXME: Remove `-Paws.kotlin.native=false` when Kotlin Native is ready
+            ":tests:codegen:smoke-tests:services:$service:smokeTest",
+        )
         .withEnvironment(envVars)
 
     val buildResult = if (expectingFailure) task.buildAndFail() else task.build()