diff --git a/qubes/tests/int/basic.py b/qubes/tests/int/basic.py
index 97e502c9..5d0f6ba2 100644
--- a/qubes/tests/int/basic.py
+++ b/qubes/tests/int/basic.py
@@ -465,7 +465,7 @@ class TC_30_Gui_daemon(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
         # Type and copy some text
         subprocess.check_call(['xdotool', 'search', '--name', window_title,
                                'windowactivate', '--sync',
-                               'type', '{}'.format(test_string)])
+                               'type', test_string])
         # second xdotool call because type --terminator do not work (SEGV)
         # additionally do not use search here, so window stack will be empty
         # and xdotool will use XTEST instead of generating events manually -
diff --git a/templates/libvirt/devices/net.xml b/templates/libvirt/devices/net.xml
index dd51f714..c86b8af5 100644
--- a/templates/libvirt/devices/net.xml
+++ b/templates/libvirt/devices/net.xml
@@ -7,7 +7,7 @@
             {{ vm.ip }}
         {%- endif %}" />
     <backenddomain name="{{ vm.netvm.name }}" />
-    <script path="vif-route-qubes"></script>
+    <script path="vif-route-qubes" />
 </interface>
 
 {# vim : set ft=jinja ts=4 sts=4 sw=4 et : #}
diff --git a/templates/libvirt/xen.xml b/templates/libvirt/xen.xml
index 53ac21ea..eeae75c3 100644
--- a/templates/libvirt/xen.xml
+++ b/templates/libvirt/xen.xml
@@ -84,7 +84,7 @@
                 {% endif %}
 
                 {% if device.script %}
-                    <script path="{{ device.script }}"></script>
+                    <script path="{{ device.script }}" />
                 {% endif %}
             </disk>
         {% endfor %}