diff --git a/roles/common/tasks/cr_tests.yml b/roles/common/tasks/cr_tests.yml
index a1bbae54..cc7d4cad 100644
--- a/roles/common/tasks/cr_tests.yml
+++ b/roles/common/tasks/cr_tests.yml
@@ -19,7 +19,7 @@
     condition_type: "{{ item.condition_type if item.condition_type is defined else '' }}"
 
 - name: |
-    Verify that the {{ item.kind }} {{ item.name }} CR is {{ condition_type }}
+    {{ 'TEST' if condition_type | length > 0 }} Verify that the {{ item.kind }} {{ item.name }} CR is {{ condition_type }}
     {{ common_cr_ready_test_id if condition_type | length > 0 }}
   ansible.builtin.command:
     cmd: |
@@ -28,3 +28,6 @@
   changed_when: false
   failed_when:
     - result.stdout != "True"
+  when:
+    - common_cr_ready_test_id is defined
+    - condition_type | length > 0