diff --git a/echo-core/src/test/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgentSpec.groovy b/echo-core/src/test/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgentSpec.groovy
index bc702edb5..4a3b359f3 100644
--- a/echo-core/src/test/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgentSpec.groovy
+++ b/echo-core/src/test/groovy/com/netflix/spinnaker/echo/notification/AbstractEventNotificationAgentSpec.groovy
@@ -39,7 +39,7 @@ class AbstractEventNotificationAgentSpec extends Specification {
   @Unroll
   def "sends notifications based on status and configuration"() {
     given:
-    subclassMock.sendNotifications(*_) >> { notification, application, event, config, status -> }
+    subclassMock.sendNotifications(*_) >> { notification, application, event, config, status_local -> }
 
     when:
     agent.processEvent(event)
diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
index 5ddf199b0..5b7240f75 100644
--- a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
+++ b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GithubNotificationAgentSpec.groovy
@@ -47,8 +47,8 @@ class GithubNotificationAgentSpec extends Specification {
   def "sets correct status check for #status status in pipeline events"() {
     given:
     def actualMessage = new BlockingVariable<GithubStatus>()
-    github.updateCheck(*_) >> { token, repo, sha, status ->
-      actualMessage.set(status)
+    github.updateCheck(*_) >> { token, repo, sha, status_local ->
+      actualMessage.set(status_local)
     }
     github.getCommit(*_) >> { token, repo, sha ->
       new Response("url", 200, "nothing", [], new TypedByteArray("application/json", "message".bytes))
@@ -96,8 +96,8 @@ class GithubNotificationAgentSpec extends Specification {
   def "sets correct status check for #status status in stage events"() {
     given:
     def actualMessage = new BlockingVariable<GithubStatus>()
-    github.updateCheck(*_) >> { token, repo, sha, status ->
-      actualMessage.set(status)
+    github.updateCheck(*_) >> { token, repo, sha, status_local ->
+      actualMessage.set(status_local)
     }
     github.getCommit(*_) >> { token, repo, sha ->
       new Response("url", 200, "nothing", [], new TypedByteArray("application/json", "message".bytes))
diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleChatNotificationAgentSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleChatNotificationAgentSpec.groovy
index cca6df456..511445446 100644
--- a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleChatNotificationAgentSpec.groovy
+++ b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/GoogleChatNotificationAgentSpec.groovy
@@ -60,8 +60,8 @@ public class GoogleChatNotificationAgentSpec extends Specification {
   def "appends custom message to #status message if present"() {
     given:
     def actualMessage = new BlockingVariable<GoogleChatMessage>()
-    googleChat.sendMessage(*_) >> { webhookURL, message ->
-      actualMessage.set(message)
+    googleChat.sendMessage(*_) >> { webhookURL_local, message_local ->
+      actualMessage.set(message_local)
     }
 
     when:
@@ -89,8 +89,8 @@ public class GoogleChatNotificationAgentSpec extends Specification {
   def "sends entirely custom message if customMessage field is present, performing text replacement if needed"() {
     given:
     def actualMessage = new BlockingVariable<GoogleChatMessage>()
-    googleChat.sendMessage(*_) >> { webhookURL, message ->
-      actualMessage.set(message)
+    googleChat.sendMessage(*_) >> { webhookURL_local, message_local ->
+      actualMessage.set(message_local)
     }
 
     when:
diff --git a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgentSpec.groovy b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgentSpec.groovy
index 4b2d06cf0..eabd6b289 100644
--- a/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgentSpec.groovy
+++ b/echo-notifications/src/test/groovy/com/netflix/spinnaker/echo/notification/SlackNotificationAgentSpec.groovy
@@ -33,7 +33,7 @@ class SlackNotificationAgentSpec extends Specification {
   def "sends correct message for #status status"() {
     given:
     def actualMessage = new BlockingVariable<SlackAttachment>()
-    slack.sendMessage(*_) >> { message, channel, asUser ->
+    slack.sendMessage(*_) >> { message, channel_local, asUser ->
       actualMessage.set(message)
     }
 
@@ -59,8 +59,8 @@ class SlackNotificationAgentSpec extends Specification {
   def "appends custom message to #status message if present"() {
     given:
     def actualMessage = new BlockingVariable<SlackAttachment>()
-    slack.sendMessage(*_) >> { message, channel, asUser ->
-      actualMessage.set(message)
+    slack.sendMessage(*_) >> { message_local, channel_local, asUser ->
+      actualMessage.set(message_local)
     }
 
     when:
@@ -88,7 +88,7 @@ class SlackNotificationAgentSpec extends Specification {
   def "sends entirely custom message if customMessage field is present, performing text replacement if needed"() {
     given:
     def actualMessage = new BlockingVariable<SlackAttachment>()
-    slack.sendMessage(*_) >> { message, channel, asUser ->
+    slack.sendMessage(*_) >> { message, channel_local, asUser ->
       actualMessage.set(message)
     }