diff --git a/testsite/playbooks/tls.yml b/testsite/playbooks/tls.yml
index 27b866cc040e11b4eb5560c7bc6bbc6e851fb3db..ac1857d309b21cb720c138df23229391b89e7a65 100644
--- a/testsite/playbooks/tls.yml
+++ b/testsite/playbooks/tls.yml
@@ -27,6 +27,8 @@
       - hostname: xmpp
         service: xmpp
         name: XMPP
+        extra_dns_names:
+          - "{{ testsite_domain }}"
   tasks:
     - name: Create GnuTLS certificate templates for all hosts
       template: src="../tls/gnutls_server_certificate.cfg.j2" dest="../tls/{{ item.hostname }}.{{ testsite_domain }}_{{ item.service }}.cfg"
diff --git a/testsite/tls/gnutls_server_certificate.cfg.j2 b/testsite/tls/gnutls_server_certificate.cfg.j2
index 9ca53694d860c0c4cffaa150013e9a3bfd510e27..8c3aa85773be4c7b47a6e5e126c21d437546e0ae 100644
--- a/testsite/tls/gnutls_server_certificate.cfg.j2
+++ b/testsite/tls/gnutls_server_certificate.cfg.j2
@@ -18,6 +18,9 @@ expiration_days = 365
 
 # A dnsname in case of a WWW server.
 dns_name = "{{ item.hostname }}.{{ testsite_domain }}"
+{% for dns_name in item.extra_dns_names | default([]) %}
+dns_name = "{{ dns_name }}"
+{% endfor %}
 
 # Whether this certificate will be used for a TLS server
 tls_www_server