diff --git a/features/retry_auto_attach.feature b/features/retry_auto_attach.feature
index b247d99ab7..f8931cdd5b 100644
--- a/features/retry_auto_attach.feature
+++ b/features/retry_auto_attach.feature
@@ -117,19 +117,14 @@ Feature: auto-attach retries periodically on failures
 
     Examples: ubuntu release
       | release | machine_type  |
-      | xenial  | aws.generic   |
       | xenial  | azure.generic |
       | xenial  | gcp.generic   |
-      | bionic  | aws.generic   |
       | bionic  | azure.generic |
       | bionic  | gcp.generic   |
-      | focal   | aws.generic   |
       | focal   | azure.generic |
       | focal   | gcp.generic   |
-      | jammy   | aws.generic   |
       | jammy   | azure.generic |
       | jammy   | gcp.generic   |
-      | noble   | aws.generic   |
       | noble   | azure.generic |
       | noble   | gcp.generic   |
 
diff --git a/features/steps/ubuntu_advantage_tools.py b/features/steps/ubuntu_advantage_tools.py
index 2a39139949..9c14ca4484 100644
--- a/features/steps/ubuntu_advantage_tools.py
+++ b/features/steps/ubuntu_advantage_tools.py
@@ -314,6 +314,7 @@ def create_local_ppa(context, release):
     )
 
 
+@when("I install ubuntu-pro-auto-attach")
 @when("I install ubuntu-advantage-pro")
 def when_i_install_pro(context, machine_name=SUT):
     if context.pro_config.install_from is InstallationSource.LOCAL: