diff --git a/tests/run.yml b/tests/run.yml
index 235ab59a1f2db1a821bd8a543d0b64000ffa9805..cc7d61583ccc46b6eafa0d89ccd94fe1364a22d1 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -102,15 +102,15 @@
         # nova-compute.conf
         - src: "tests/templates/nova-compute-overrides.j2"
           dest: /etc/kolla/config/nova/nova-compute.conf
-          when: scenario != "bifrost"
+          when: "{{ scenario != 'bifrost' }}"
         # ceph.conf
         - src: "tests/templates/ceph-overrides.j2"
           dest: /etc/kolla/config/ceph.conf
-          when: "{{ 'ceph' in scenario }}"
+          when: "{{ is_ceph }}"
         # bifrost/dib.yml
         - src: "tests/templates/bifrost-dib-overrides.j2"
           dest: /etc/kolla/config/bifrost/dib.yml
-          when: scenario == "bifrost"
+          when: "{{ scenario == 'bifrost' }}"
         - src: "tests/templates/ironic-overrides.j2"
           dest: /etc/kolla/config/ironic.conf
           when: "{{ scenario == 'ironic' }}"