diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index 75815a8..240a173 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -5,8 +5,8 @@
 
 - name: Fetch local EC2 metadata
   ec2_metadata_facts:
-  # Guard is mostly for testing
-  when: ansible_system_vendor == "Amazon EC2"
+  tags:
+    - notest
 
 - name: Use EC2 instance ID for cluster node ID
   set_fact: