diff --git a/features/adapter_broadcast.feature b/features/adapter_broadcast.feature
index 56722123440475bcb2d61de27095f3d2e5705f18..9440f93edcab7f96f9a9146c00cdff92892fcbb0 100644
--- a/features/adapter_broadcast.feature
+++ b/features/adapter_broadcast.feature
@@ -27,7 +27,7 @@ Feature: Can the adapter broadcast messages?
     Then the credentials are deleted
     Then the broadcast method was called with is_retry on
     Then the total number of calls to "broadcast" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 2
+    Then the total number of "GET" requests to "/token" was 2
     
   Scenario: On a retried 403 the message is not retried again
     Given valid config 
@@ -49,7 +49,7 @@ Feature: Can the adapter broadcast messages?
     Then the credentials are not deleted
     Then the broadcast method was called with is_retry on
     Then the total number of calls to "broadcast" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 1
+    Then the total number of "GET" requests to "/token" was 1
     
   Scenario: On a retried 503 the message is not retried again
     Given valid config 
diff --git a/features/adapter_poll.feature b/features/adapter_poll.feature
index bef9538354c4ee372aaed451a92af076a76a168f..a30ea04f676141d3d5c39b4e30f504e8f1b6aafe 100644
--- a/features/adapter_poll.feature
+++ b/features/adapter_poll.feature
@@ -51,7 +51,7 @@ Feature: Can the adapter receive messages?
     Then the credentials are deleted
     Then the poll method was called with is_retry on
     Then the total number of calls to "poll" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 1
+    Then the total number of "GET" requests to "/token" was 2
     
   Scenario: On a retried 403 the message is not retried again
     Given valid config 
@@ -73,8 +73,8 @@ Feature: Can the adapter receive messages?
     Then the credentials are not deleted
     Then the poll method was called with is_retry on
     Then the total number of calls to "poll" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 1
-    
+    Then the total number of "GET" requests to "/token" was 1
+  
   Scenario: On a retried 503 the message is not retried again
     Given valid config 
     When the adapter instance is created 
diff --git a/features/adapter_publish.feature b/features/adapter_publish.feature
index 6675b4edb9e2f6b118fb94eaa5d03f119a088672..5e626bfbefc3e20698f6bac9f40fabd0f1746f46 100644
--- a/features/adapter_publish.feature
+++ b/features/adapter_publish.feature
@@ -27,7 +27,7 @@ Feature: Can the adapter publish messages?
     Then the credentials are deleted
     Then the publish method was called with is_retry on
     Then the total number of calls to "publish" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 2  
+    Then the total number of "GET" requests to "/token" was 2
     
   Scenario: On a retried 403 the message is not retried again
     Given valid config 
@@ -49,7 +49,7 @@ Feature: Can the adapter publish messages?
     Then the credentials are not deleted
     Then the publish method was called with is_retry on
     Then the total number of calls to "publish" was 2
-    Then the total number of calls to "getAuthorizationHeader" was 1
+    Then the total number of "GET" requests to "/token" was 1
     
   Scenario: On a retried 503 the message is not retried again
     Given valid config