diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2
index 5619b7817f..06fc06c22f 100644
--- a/tests/templates/globals-default.j2
+++ b/tests/templates/globals-default.j2
@@ -146,6 +146,8 @@ openstack_cacert: "/etc/pki/tls/certs/ca-bundle.crt"
 {% endif %}
 kolla_admin_openrc_cacert: "{% raw %}{{ kolla_certificates_dir }}{% endraw %}/ca/root.crt"
 rabbitmq_enable_tls: "yes"
+# TODO(mgoddard): Set this to "yes" when previous release is Yoga.
+libvirt_tls: "{{ not is_upgrade or previous_release != 'xena' }}"
 {% endif %}
 
 {% if scenario == 'linuxbridge' %}