diff --git a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
index 44333f49b81..5841c182c07 100644
--- a/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
+++ b/hll/dynamodb-mapper/dynamodb-mapper/build.gradle.kts
@@ -178,8 +178,7 @@ val startDdbLocal = task<DynamoDbLocalInstance>("startDdbLocal") {
 
 tasks.withType<Test> {
     dependsOn(startDdbLocal)
-}
-
-gradle.buildFinished {
-    startDdbLocal.stop()
+    doLast {
+        startDdbLocal.stop()
+    }
 }