diff --git a/README.md b/README.md
index 2d9f2b119f..ec5b9b5f60 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,8 @@ Project Layout
 * `aws`: AWS specific codegen & Rust code (signing, endpoints, customizations, etc.)
   Common commands:
   * `./gradlew :aws:sdk:assemble`: Generate (but do not test / compile etc.) a fresh SDK into `sdk/build/aws-sdk`
-  * `./gradlew :aws:sdk:test`: Generate & run all tests for a fresh SDK
+  * `./gradlew :aws:sdk:sdkTest`: Generate & run all tests for a fresh SDK. (Note that these tests require Go to be
+  installed for FIP support to compile properly)
   * `./gradlew :aws:sdk:{cargoCheck, cargoTest, cargoDocs, cargoClippy}`: Generate & run specified cargo command.
 * `codegen-core`: Common code generation logic useful for clients and servers
 * `codegen-client`: Whitelabel Smithy client code generation
@@ -123,7 +124,7 @@ to generate more or less AWS service clients.
 # Generate an SDK, but do not attempt to compile / run tests. Useful for inspecting generated code
 ./gradlew :aws:sdk:assemble
 # Run all the tests
-./gradlew :aws:sdk:test
+./gradlew :aws:sdk:sdkTest
 # Validate that the generated code compiles
 ./gradlew :aws:sdk:cargoCheck
 # Validate that the generated code passes Clippy
diff --git a/aws/sdk/build.gradle.kts b/aws/sdk/build.gradle.kts
index 2b9ecf94b3..6e2165eb12 100644
--- a/aws/sdk/build.gradle.kts
+++ b/aws/sdk/build.gradle.kts
@@ -445,8 +445,12 @@ tasks["assemble"].apply {
 project.registerCargoCommandsTasks(outputDir.asFile, defaultRustDocFlags)
 project.registerGenerateCargoConfigTomlTask(outputDir.asFile)
 
-tasks["test"].dependsOn("assemble")
-tasks["test"].finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
+//The task name "test" is already registered by one of our plugins
+tasks.register("sdkTest") {
+    description = "Run Cargo clippy/test/docs against the generated SDK."
+    dependsOn("assemble")
+    finalizedBy(Cargo.CLIPPY.toString, Cargo.TEST.toString, Cargo.DOCS.toString)
+}
 
 tasks.register<Delete>("deleteSdk") {
     delete(