diff --git a/linux/systemd/qubes-core.service b/linux/systemd/qubes-core.service
index de9a827d..34ce40fd 100644
--- a/linux/systemd/qubes-core.service
+++ b/linux/systemd/qubes-core.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Qubes Dom0 startup setup
-After=qubes-db-dom0.service libvirtd.service xenconsoled.service
+After=qubes-db-dom0.service libvirtd.service xenconsoled.service qubesd.service qubes-qmemman.service
 # Cover legacy init.d script
 
 [Service]
diff --git a/qubes/api/__init__.py b/qubes/api/__init__.py
index 0dd2e1f8..e93d0a1b 100644
--- a/qubes/api/__init__.py
+++ b/qubes/api/__init__.py
@@ -285,9 +285,6 @@ class QubesDaemonProtocol(asyncio.Protocol):
             if self.debug:
                 self.app.log.exception(msg,
                     err, src, meth, dest, arg, len(untrusted_payload))
-            else:
-                self.app.log.info(msg,
-                    err, src, meth, dest, arg, len(untrusted_payload))
             if self.transport is not None:
                 self.send_exception(err)
                 self.transport.write_eof()
diff --git a/qubes/app.py b/qubes/app.py
index cc7fa68a..ba7b085a 100644
--- a/qubes/app.py
+++ b/qubes/app.py
@@ -484,6 +484,8 @@ class VMCollection(object):
         self.app.fire_event('domain-pre-delete', pre_event=True, vm=vm)
         try:
             vm.libvirt_domain.undefine()
+            # pylint: disable=protected-access
+            vm._libvirt_domain = None
         except libvirt.libvirtError as e:
             if e.get_error_code() == libvirt.VIR_ERR_NO_DOMAIN:
                 # already undefined
@@ -1196,7 +1198,9 @@ class Qubes(qubes.PropertyHolder):
                         self.log.error(
                             'Cannot remove %s, used by %s.%s',
                             vm, obj, prop.__name__)
-                        raise qubes.exc.QubesVMInUseError(vm)
+                        raise qubes.exc.QubesVMInUseError(vm,
+                            'Domain is in use: {!r}; details in system log'
+                                .format(vm.name))
                 except AttributeError:
                     pass
 
diff --git a/qubes/backup.py b/qubes/backup.py
index c7933e2c..3e0e91a1 100644
--- a/qubes/backup.py
+++ b/qubes/backup.py
@@ -23,6 +23,7 @@ from __future__ import unicode_literals
 import itertools
 import logging
 import functools
+import string
 import termios
 
 import asyncio
@@ -665,6 +666,13 @@ class Backup(object):
             raise
 
         if proc.returncode:
+            if proc.stderr is not None:
+                proc_stderr = (yield from proc.stderr.read())
+                proc_stderr = proc_stderr.decode('ascii', errors='ignore')
+                proc_stderr = ''.join(
+                    c for c in proc_stderr if c in string.printable and
+                                              c not in '\r\n%{}')
+                error_message += ': ' + proc_stderr
             raise qubes.exc.QubesException(error_message)
 
     @staticmethod
@@ -694,7 +702,7 @@ class Backup(object):
         self.tmpdir = tempfile.mkdtemp()
         shutil.copy(qubes_xml, os.path.join(self.tmpdir, 'qubes.xml'))
         qubes_xml = os.path.join(self.tmpdir, 'qubes.xml')
-        backup_app = qubes.Qubes(qubes_xml)
+        backup_app = qubes.Qubes(qubes_xml, offline_mode=True)
         backup_app.events_enabled = False
 
         files_to_backup = self._files_to_backup
@@ -709,6 +717,7 @@ class Backup(object):
             backup_app.domains[qid].features['backup-path'] = vm_info.subdir
             backup_app.domains[qid].features['backup-size'] = vm_info.size
         backup_app.save()
+        del backup_app
 
         vmproc = None
         if self.target_vm is not None:
@@ -716,7 +725,9 @@ class Backup(object):
             # If APPVM, STDOUT is a PIPE
             read_fd, write_fd = os.pipe()
             vmproc = yield from self.target_vm.run_service('qubes.Backup',
-                stdin=read_fd, stderr=subprocess.PIPE)
+                stdin=read_fd,
+                stderr=subprocess.PIPE,
+                stdout=subprocess.DEVNULL)
             os.close(read_fd)
             os.write(write_fd, (self.target_dir.
                 replace("\r", "").replace("\n", "") + "\n").encode())
@@ -754,11 +765,12 @@ class Backup(object):
 
         vmproc_task = None
         if vmproc is not None:
-            vmproc_task = asyncio.ensure_future(self._cancel_on_error(
+            vmproc_task = asyncio.ensure_future(
                 self._monitor_process(vmproc,
                     'Writing backup to VM {} failed'.format(
-                        self.target_vm.name)),
-                    send_task))
+                        self.target_vm.name)))
+            asyncio.ensure_future(self._cancel_on_error(
+                vmproc_task, send_task))
 
         for file_name in header_files:
             yield from to_send.put(file_name)
@@ -782,10 +794,12 @@ class Backup(object):
             except:
                 yield from to_send.put(QUEUE_ERROR)
                 # in fact we may be handling CancelledError, induced by
-                # exception in send_task (and propagated by
+                # exception in send_task or vmproc_task (and propagated by
                 # self._cancel_on_error call above); in such a case this
                 # yield from will raise exception, covering CancelledError -
                 # this is intended behaviour
+                if vmproc_task:
+                    yield from vmproc_task
                 yield from send_task
                 raise
 
diff --git a/qubes/tests/integ/backup.py b/qubes/tests/integ/backup.py
index b04553ec..52ddced9 100644
--- a/qubes/tests/integ/backup.py
+++ b/qubes/tests/integ/backup.py
@@ -27,6 +27,9 @@ import os
 import shutil
 
 import sys
+
+import asyncio
+
 import qubes
 import qubes.backup
 import qubes.exc
@@ -38,6 +41,14 @@ import qubes.vm.appvm
 import qubes.vm.templatevm
 import qubes.vm.qubesvm
 
+try:
+    import qubesadmin.backup.restore
+    import qubesadmin.exc
+    restore_available = True
+except ImportError:
+    restore_available = False
+
+
 # noinspection PyAttributeOutsideInit
 class BackupTestsMixin(object):
     class BackupErrorHandler(logging.Handler):
@@ -65,15 +76,15 @@ class BackupTestsMixin(object):
 
         self.error_handler = self.BackupErrorHandler(self.error_detected,
             level=logging.WARNING)
-        backup_log = logging.getLogger('qubes.backup')
+        backup_log = logging.getLogger('qubesadmin.backup')
         backup_log.addHandler(self.error_handler)
 
     def tearDown(self):
-        super(BackupTestsMixin, self).tearDown()
         shutil.rmtree(self.backupdir)
 
         backup_log = logging.getLogger('qubes.backup')
         backup_log.removeHandler(self.error_handler)
+        super(BackupTestsMixin, self).tearDown()
 
     def fill_image(self, path, size=None, sparse=False):
         block_size = 4096
@@ -112,7 +123,6 @@ class BackupTestsMixin(object):
         self.log.debug("Creating %s" % vmname)
         testvm1 = self.app.add_new_vm(qubes.vm.appvm.AppVM,
             name=vmname, template=template, label='red')
-        testvm1.uses_default_netvm = False
         testvm1.netvm = testnet
         self.loop.run_until_complete(
             testvm1.create_on_disk(pool=pool))
@@ -175,10 +185,18 @@ class BackupTestsMixin(object):
             else:
                 raise
 
+    def remove_vms(self, vms):
+        vms = list(vms)
+        for vm in vms:
+            vm.netvm = None
+            vm.default_dispvm = None
+        super(BackupTestsMixin, self).remove_vms(vms)
+
     def restore_backup(self, source=None, appvm=None, options=None,
                        expect_errors=None, manipulate_restore_info=None,
                        passphrase='qubes'):
-        self.skipTest('Test not converted to Qubes 4.0')
+        if not restore_available:
+            self.skipTest('qubesadmin module not available')
 
         if source is None:
             backupfile = os.path.join(self.backupdir,
@@ -186,19 +204,30 @@ class BackupTestsMixin(object):
         else:
             backupfile = source
 
-        with self.assertNotRaises(qubes.exc.QubesException):
-            restore_op = qubes.backup.BackupRestore(
-                self.app, backupfile, appvm, passphrase)
+        client_app = qubesadmin.Qubes()
+        if appvm:
+            appvm = self.loop.run_until_complete(
+                self.loop.run_in_executor(None,
+                    client_app.domains.__getitem__, appvm.name))
+        with self.assertNotRaises(qubesadmin.exc.QubesException):
+            restore_op = self.loop.run_until_complete(
+                self.loop.run_in_executor(None,
+                    qubesadmin.backup.restore.BackupRestore,
+                    client_app, backupfile, appvm, passphrase))
             if options:
                 for key, value in options.items():
                     setattr(restore_op.options, key, value)
-            restore_info = restore_op.get_restore_info()
+            restore_info = self.loop.run_until_complete(
+                self.loop.run_in_executor(None,
+                    restore_op.get_restore_info))
         if callable(manipulate_restore_info):
             restore_info = manipulate_restore_info(restore_info)
         self.log.debug(restore_op.get_restore_summary(restore_info))
 
-        with self.assertNotRaises(qubes.exc.QubesException):
-            restore_op.restore_do(restore_info)
+        with self.assertNotRaises(qubesadmin.exc.QubesException):
+            self.loop.run_until_complete(
+                self.loop.run_in_executor(None,
+                    restore_op.restore_do, restore_info))
 
         errors = []
         if expect_errors is None:
@@ -230,7 +259,7 @@ class BackupTestsMixin(object):
             for name, volume in vm.volumes.items():
                 if not volume.rw or not volume.save_on_stop:
                     continue
-                vol_path = vm.storage.get_pool(volume).export(volume)
+                vol_path = volume.export()
                 hasher = hashlib.sha1()
                 with open(vol_path, 'rb') as afile:
                     for buf in iter(lambda: afile.read(4096000), b''):
@@ -238,7 +267,37 @@ class BackupTestsMixin(object):
                 hashes[vm.name][name] = hasher.hexdigest()
         return hashes
 
-    def assertCorrectlyRestored(self, orig_vms, orig_hashes):
+    def get_vms_info(self, vms):
+        ''' Get VM metadata, for comparing VM later without holding actual
+        reference to the old object.'''
+
+        vms_info = {}
+        for vm in vms:
+            vm_info = {
+                'properties': {},
+                'default': {},
+                'devices': {},
+            }
+            for prop in ('name', 'kernel',
+                    'memory', 'maxmem', 'kernelopts',
+                    'services', 'vcpus', 'features'
+                    'include_in_backups', 'default_user', 'qrexec_timeout',
+                    'autostart', 'pci_strictreset', 'debug',
+                    'internal', 'netvm', 'template', 'label'):
+                if not hasattr(vm, prop):
+                    continue
+                vm_info['properties'][prop] = str(getattr(vm, prop))
+                vm_info['default'][prop] = vm.property_is_default(prop)
+            for dev_class in vm.devices.keys():
+                vm_info['devices'][dev_class] = {}
+                for dev_ass in vm.devices[dev_class].assignments():
+                    vm_info['devices'][dev_class][str(dev_ass.device)] = \
+                        dev_ass.options
+            vms_info[vm.name] = vm_info
+
+        return vms_info
+
+    def assertCorrectlyRestored(self, vms_info, orig_hashes):
         ''' Verify if restored VMs are identical to those before backup.
 
         :param orig_vms: collection of original QubesVM objects
@@ -246,114 +305,108 @@ class BackupTestsMixin(object):
             before backup
         :return:
         '''
-        for vm in orig_vms:
-            self.assertIn(vm.name, self.app.domains)
-            restored_vm = self.app.domains[vm.name]
-            for prop in ('name', 'kernel',
-                    'memory', 'maxmem', 'kernelopts',
-                    'services', 'vcpus', 'features'
-                    'include_in_backups', 'default_user', 'qrexec_timeout',
-                    'autostart', 'pci_strictreset', 'debug',
-                    'internal'):
-                if not hasattr(vm, prop):
-                    continue
+        for vm_name in vms_info:
+            vm_info = vms_info[vm_name]
+            self.assertIn(vm_name, self.app.domains)
+            restored_vm = self.app.domains[vm_name]
+            for prop in vm_info['properties']:
                 self.assertEqual(
-                    getattr(vm, prop), getattr(restored_vm, prop),
+                    vm_info['properties'][prop],
+                    str(getattr(restored_vm, prop)),
                     "VM {} - property {} not properly restored".format(
-                        vm.name, prop))
-            for prop in ('netvm', 'template', 'label'):
-                if not hasattr(vm, prop):
-                    continue
-                orig_value = getattr(vm, prop)
-                restored_value = getattr(restored_vm, prop)
-                if orig_value and restored_value:
-                    self.assertEqual(orig_value.name, restored_value.name,
-                        "VM {} - property {} not properly restored".format(
-                            vm.name, prop))
-                else:
-                    self.assertEqual(orig_value, restored_value,
-                        "VM {} - property {} not properly restored".format(
-                            vm.name, prop))
-            for dev_class in vm.devices.keys():
-                for dev in vm.devices[dev_class]:
-                    self.assertIn(dev, restored_vm.devices[dev_class],
-                        "VM {} - {} device not restored".format(
-                            vm.name, dev_class))
+                        vm_name, prop))
+                self.assertEqual(
+                    vm_info['default'][prop],
+                    restored_vm.property_is_default(prop),
+                    "VM {} - property {} differs in being default".format(
+                        vm_name, prop))
+            for dev_class in vm_info['devices']:
+                for dev in vm_info['devices'][dev_class]:
+                    found = False
+                    for restored_dev_ass in restored_vm.devices[
+                            dev_class].assignments():
+                        if str(restored_dev_ass.device) == dev:
+                            found = True
+                            self.assertEqual(vm_info['devices'][dev_class][dev],
+                                restored_dev_ass.options,
+                                'VM {} - {} device {} options mismatch'.format(
+                                    vm_name, dev_class, str(dev)))
+                    self.assertTrue(found,
+                        'VM {} - {} device {} not restored'.format(
+                            vm_name, dev_class, dev))
 
             if orig_hashes:
                 hashes = self.vm_checksum([restored_vm])[restored_vm.name]
-                self.assertEqual(orig_hashes[vm.name], hashes,
+                self.assertEqual(orig_hashes[vm_name], hashes,
                     "VM {} - disk images are not properly restored".format(
-                        vm.name))
+                        vm_name))
 
 
 class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
     def test_000_basic_backup(self):
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms)
-        self.remove_vms(reversed(vms))
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms)
+            self.remove_vms(reversed(vms))
+        finally:
+            del vms
         self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
-        self.remove_vms(reversed(vms))
+        self.assertCorrectlyRestored(vms_info, orig_hashes)
 
     def test_001_compressed_backup(self):
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, compressed=True)
-        self.remove_vms(reversed(vms))
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms, compressed=True)
+            self.remove_vms(reversed(vms))
+        finally:
+            del vms
         self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
-
-    def test_002_encrypted_backup(self):
-        vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, encrypted=True)
-        self.remove_vms(reversed(vms))
-        self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
-
-    def test_003_compressed_encrypted_backup(self):
-        vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, compressed=True, encrypted=True)
-        self.remove_vms(reversed(vms))
-        self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
+        self.assertCorrectlyRestored(vms_info, orig_hashes)
 
     def test_004_sparse_multipart(self):
         vms = []
+        try:
+            vmname = self.make_vm_name('testhvm2')
+            self.log.debug("Creating %s" % vmname)
 
-        vmname = self.make_vm_name('testhvm2')
-        self.log.debug("Creating %s" % vmname)
+            self.hvmtemplate = self.app.add_new_vm(
+                qubes.vm.templatevm.TemplateVM, name=vmname, virt_mode='hvm', label='red')
+            self.loop.run_until_complete(self.hvmtemplate.create_on_disk())
+            self.fill_image(
+                os.path.join(self.hvmtemplate.dir_path, '00file'),
+                195 * 1024 * 1024 - 4096 * 3)
+            self.fill_image(self.hvmtemplate.storage.export('private'),
+                            195 * 1024 * 1024 - 4096 * 3)
+            self.fill_image(self.hvmtemplate.storage.export('root'), 1024 * 1024 * 1024,
+                            sparse=True)
+            vms.append(self.hvmtemplate)
+            self.app.save()
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
 
-        hvmtemplate = self.app.add_new_vm(
-            qubes.vm.templatevm.TemplateVM, name=vmname, virt_mode='hvm', label='red')
-        hvmtemplate.create_on_disk()
-        self.fill_image(
-            os.path.join(hvmtemplate.dir_path, '00file'),
-            195 * 1024 * 1024 - 4096 * 3)
-        self.fill_image(hvmtemplate.storage.export('private'),
-                        195 * 1024 * 1024 - 4096 * 3)
-        self.fill_image(hvmtemplate.storage.export('root'), 1024 * 1024 * 1024,
-                        sparse=True)
-        vms.append(hvmtemplate)
-        self.app.save()
-        orig_hashes = self.vm_checksum(vms)
-
-        self.make_backup(vms)
-        self.remove_vms(reversed(vms))
-        self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
-        # TODO check vm.backup_timestamp
+            self.make_backup(vms)
+            self.remove_vms(reversed(vms))
+            self.restore_backup()
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+            # TODO check vm.backup_timestamp
+        finally:
+            del vms
 
     def test_005_compressed_custom(self):
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, compression_filter="bzip2")
-        self.remove_vms(reversed(vms))
-        self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms, compression_filter="bzip2")
+            self.remove_vms(reversed(vms))
+            self.restore_backup()
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_010_selective_restore(self):
         # create backup with internal dependencies (template, netvm etc)
@@ -368,27 +421,39 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
                 restore_info.pop(name)
             return restore_info
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, compression_filter="bzip2")
-        self.remove_vms(reversed(vms))
-        self.restore_backup(manipulate_restore_info=exclude_some)
-        for vm in vms:
-            if vm.name == self.make_vm_name('test1'):
-                # netvm was set to 'test-inst-test-net' - excluded
-                vm.netvm = qubes.property.DEFAULT
-            elif vm.name == self.make_vm_name('custom'):
-                # template was set to 'test-inst-template' - excluded
-                vm.template = self.app.default_template
-        vms = [vm for vm in vms if vm.name not in exclude]
-        self.assertCorrectlyRestored(vms, orig_hashes)
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms, compression_filter="bzip2")
+            self.remove_vms(reversed(vms))
+            self.restore_backup(manipulate_restore_info=exclude_some)
+            for vm_name in vms_info:
+                if vm_name == self.make_vm_name('test1'):
+                    # netvm was set to 'test-inst-test-net' - excluded
+                    vms_info[vm_name]['properties']['netvm'] = \
+                        str(self.app.default_netvm)
+                    vms_info[vm_name]['default']['netvm'] = True
+                elif vm_name == self.make_vm_name('custom'):
+                    # template was set to 'test-inst-template' - excluded
+                    vms_info[vm_name]['properties']['template'] = \
+                        str(self.app.default_template)
+            for excluded in exclude:
+                vms_info.pop(excluded, None)
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_020_encrypted_backup_non_ascii(self):
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms, encrypted=True, passphrase=u'zażółć gęślą jaźń')
-        self.remove_vms(reversed(vms))
-        self.restore_backup(passphrase=u'zażółć gęślą jaźń')
-        self.assertCorrectlyRestored(vms, orig_hashes)
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms, passphrase=u'zażółć gęślą jaźń')
+            self.remove_vms(reversed(vms))
+            self.restore_backup(passphrase=u'zażółć gęślą jaźń')
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_100_backup_dom0_no_restore(self):
         # do not write it into dom0 home itself...
@@ -403,19 +468,28 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
         :return:
         """
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms)
-        self.remove_vms(reversed(vms))
-        test_dir = vms[0].dir_path
-        os.mkdir(test_dir)
-        with open(os.path.join(test_dir, 'some-file.txt'), 'w') as f:
-            f.write('test file\n')
-        self.restore_backup(
-            expect_errors=[
-                '*** Directory {} already exists! It has been moved'.format(
-                    test_dir)
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms)
+            test_dir = vms[0].dir_path
+            self.remove_vms(reversed(vms))
+            os.mkdir(test_dir)
+            with open(os.path.join(test_dir, 'some-file.txt'), 'w') as f:
+                f.write('test file\n')
+            self.restore_backup(expect_errors=[
+                'Error restoring VM test-inst-test-net, skipping: Got empty '
+                'response from qubesd. See journalctl in dom0 for details.',
+                'Error setting test-inst-test1.netvm to test-inst-test-net: '
+                '\'"No such domain: \\\'test-inst-test-net\\\'"\'',
             ])
-        self.assertCorrectlyRestored(vms, orig_hashes)
+            del vms_info['test-inst-test-net']
+            vms_info['test-inst-test1']['properties']['netvm'] = \
+                str(self.app.default_netvm)
+            vms_info['test-inst-test1']['default']['netvm'] = True
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_210_auto_rename(self):
         """
@@ -423,16 +497,22 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
         :return:
         """
         vms = self.create_backup_vms()
-        self.make_backup(vms)
-        self.restore_backup(options={
-            'rename_conflicting': True
-        })
-        for vm in vms:
-            with self.assertNotRaises(
-                    (qubes.exc.QubesVMNotFoundError, KeyError)):
-                restored_vm = self.app.domains[vm.name + '1']
-            if vm.netvm and not vm.property_is_default('netvm'):
-                self.assertEqual(restored_vm.netvm.name, vm.netvm.name + '1')
+        vms_info = self.get_vms_info(vms)
+        try:
+            self.make_backup(vms)
+            self.restore_backup(options={
+                'rename_conflicting': True
+            })
+            for vm_name in vms_info:
+                with self.assertNotRaises(
+                        (qubes.exc.QubesVMNotFoundError, KeyError)):
+                    restored_vm = self.app.domains[vm_name + '1']
+                if vms_info[vm_name]['properties']['netvm'] and \
+                        not vms_info[vm_name]['default']['netvm']:
+                    self.assertEqual(restored_vm.netvm.name,
+                        vms_info[vm_name]['properties']['netvm'] + '1')
+        finally:
+            del vms
 
     def _find_pool(self, volume_group, thin_pool):
         ''' Returns the pool matching the specified ``volume_group`` &
@@ -456,12 +536,15 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
                 **qubes.tests.storage_lvm.POOL_CONF)
             self.created_pool = True
         vms = self.create_backup_vms(pool=self.pool)
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms)
-        self.remove_vms(reversed(vms))
-        self.restore_backup()
-        self.assertCorrectlyRestored(vms, orig_hashes)
-        self.remove_vms(reversed(vms))
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms)
+            self.remove_vms(reversed(vms))
+            self.restore_backup()
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     @qubes.tests.storage_lvm.skipUnlessLvmPoolExists
     def test_301_restore_to_lvm(self):
@@ -473,17 +556,20 @@ class TC_00_Backup(BackupTestsMixin, qubes.tests.SystemTestCase):
                 **qubes.tests.storage_lvm.POOL_CONF)
             self.created_pool = True
         vms = self.create_backup_vms()
-        orig_hashes = self.vm_checksum(vms)
-        self.make_backup(vms)
-        self.remove_vms(reversed(vms))
-        self.restore_backup(options={'override_pool': self.pool.name})
-        self.assertCorrectlyRestored(vms, orig_hashes)
-        for vm in vms:
-            vm = self.app.domains[vm.name]
-            for volume in vm.volumes.values():
-                if volume.save_on_stop:
-                    self.assertEqual(volume.pool, self.pool.name)
-        self.remove_vms(reversed(vms))
+        try:
+            orig_hashes = self.vm_checksum(vms)
+            vms_info = self.get_vms_info(vms)
+            self.make_backup(vms)
+            self.remove_vms(reversed(vms))
+            self.restore_backup(options={'override_pool': self.pool.name})
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+            for vm_name in vms_info:
+                vm = self.app.domains[vm_name]
+                for volume in vm.volumes.values():
+                    if volume.save_on_stop:
+                        self.assertEqual(volume.pool, self.pool.name)
+        finally:
+            del vms
 
 
 class TC_10_BackupVMMixin(BackupTestsMixin):
@@ -499,28 +585,40 @@ class TC_10_BackupVMMixin(BackupTestsMixin):
 
     def test_100_send_to_vm_file_with_spaces(self):
         vms = self.create_backup_vms()
-        self.loop.run_until_complete(self.backupvm.start())
-        self.loop.run_until_complete(self.backupvm.run_for_stdio(
-            "mkdir '/var/tmp/backup directory'"))
-        self.make_backup(vms, target_vm=self.backupvm,
-            compressed=True, encrypted=True,
-            target='/var/tmp/backup directory')
-        self.remove_vms(reversed(vms))
-        (backup_path, _) = self.loop.run_until_complete(
-            self.backupvm.run_for_stdio("ls /var/tmp/backup*/qubes-backup*"))
-        backup_path = backup_path.decode().strip()
-        self.restore_backup(source=backup_path,
-                            appvm=self.backupvm)
+        orig_hashes = self.vm_checksum(vms)
+        vms_info = self.get_vms_info(vms)
+        try:
+            self.loop.run_until_complete(self.backupvm.start())
+            self.loop.run_until_complete(self.backupvm.run_for_stdio(
+                "mkdir '/var/tmp/backup directory'"))
+            self.make_backup(vms, target_vm=self.backupvm,
+                compressed=True,
+                target='/var/tmp/backup directory')
+            self.remove_vms(reversed(vms))
+            (backup_path, _) = self.loop.run_until_complete(
+                self.backupvm.run_for_stdio("ls /var/tmp/backup*/qubes-backup*"))
+            backup_path = backup_path.decode().strip()
+            self.restore_backup(source=backup_path,
+                                appvm=self.backupvm)
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_110_send_to_vm_command(self):
         vms = self.create_backup_vms()
-        self.loop.run_until_complete(self.backupvm.start())
-        self.make_backup(vms, target_vm=self.backupvm,
-            compressed=True, encrypted=True,
-            target='dd of=/var/tmp/backup-test')
-        self.remove_vms(reversed(vms))
-        self.restore_backup(source='dd if=/var/tmp/backup-test',
-                            appvm=self.backupvm)
+        orig_hashes = self.vm_checksum(vms)
+        vms_info = self.get_vms_info(vms)
+        try:
+            self.loop.run_until_complete(self.backupvm.start())
+            self.make_backup(vms, target_vm=self.backupvm,
+                compressed=True,
+                target='dd of=/var/tmp/backup-test')
+            self.remove_vms(reversed(vms))
+            self.restore_backup(source='dd if=/var/tmp/backup-test',
+                                appvm=self.backupvm)
+            self.assertCorrectlyRestored(vms_info, orig_hashes)
+        finally:
+            del vms
 
     def test_110_send_to_vm_no_space(self):
         """
@@ -529,21 +627,24 @@ class TC_10_BackupVMMixin(BackupTestsMixin):
         :return:
         """
         vms = self.create_backup_vms()
-        self.loop.run_until_complete(self.backupvm.start())
-        self.loop.run_until_complete(self.backupvm.run_for_stdio(
-            # Debian 7 has too old losetup to handle loop-control device
-            "mknod /dev/loop0 b 7 0;"
-            "truncate -s 50M /home/user/backup.img && "
-            "mkfs.ext4 -F /home/user/backup.img && "
-            "mkdir /home/user/backup && "
-            "mount /home/user/backup.img /home/user/backup -o loop &&"
-            "chmod 777 /home/user/backup",
-            user="root"))
-        with self.assertRaises(qubes.exc.QubesException):
-            self.make_backup(vms, target_vm=self.backupvm,
-                compressed=False, encrypted=True,
-                target='/home/user/backup',
-                expect_failure=True)
+        try:
+            self.loop.run_until_complete(self.backupvm.start())
+            self.loop.run_until_complete(self.backupvm.run_for_stdio(
+                # Debian 7 has too old losetup to handle loop-control device
+                "mknod /dev/loop0 b 7 0;"
+                "truncate -s 50M /home/user/backup.img && "
+                "mkfs.ext4 -F /home/user/backup.img && "
+                "mkdir /home/user/backup && "
+                "mount /home/user/backup.img /home/user/backup -o loop &&"
+                "chmod 777 /home/user/backup",
+                user="root"))
+            with self.assertRaises(qubes.exc.QubesException):
+                self.make_backup(vms, target_vm=self.backupvm,
+                    compressed=False,
+                    target='/home/user/backup',
+                    expect_failure=True)
+        finally:
+            del vms
 
 
 def load_tests(loader, tests, pattern):
@@ -551,7 +652,7 @@ def load_tests(loader, tests, pattern):
         tests.addTests(loader.loadTestsFromTestCase(
             type(
                 'TC_10_BackupVM_' + template,
-                (TC_10_BackupVMMixin, qubes.tests.QubesTestCase),
+                (TC_10_BackupVMMixin, qubes.tests.SystemTestCase),
                 {'template': template})))
 
     return tests
diff --git a/qubes/tests/integ/backupcompatibility.py b/qubes/tests/integ/backupcompatibility.py
index d53029f8..c52e0e62 100644
--- a/qubes/tests/integ/backupcompatibility.py
+++ b/qubes/tests/integ/backupcompatibility.py
@@ -30,25 +30,6 @@ import re
 import qubes.tests
 import qubes.tests.integ.backup
 
-QUBESXML_R2B2 = '''
-<QubesVmCollection updatevm="3" default_kernel="3.7.6-2" default_netvm="3" default_fw_netvm="2" default_template="1" clockvm="2">
-  <QubesTemplateVm installed_by_rpm="True" kernel="3.7.6-2" uses_default_kernelopts="True" qid="1" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="fedora-18-x64.conf" label="black" template_qid="none" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="fedora-18-x64" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/vm-templates/fedora-18-x64"/>
-  <QubesNetVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="2" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="netvm.conf" label="red" template_qid="1" kernelopts="iommu=soft swiotlb=4096" memory="200" default_user="user" volatile_img="volatile.img" services="{'ntpd': False, 'meminfo-writer': False}" maxmem="1535" pcidevs="['02:00.0', '03:00.0']" name="netvm" netid="1" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/servicevms/netvm"/>
-  <QubesProxyVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="3" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="firewallvm.conf" label="green" template_qid="1" kernelopts="" memory="200" default_user="user" netvm_qid="2" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="firewallvm" netid="2" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/servicevms/firewallvm"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="4" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="True" conf_file="fedora-18-x64-dvm.conf" label="gray" template_qid="1" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="fedora-18-x64-dvm" private_img="private.img" vcpus="1" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/fedora-18-x64-dvm"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="5" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="test-work.conf" label="green" template_qid="1" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="test-work" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/test-work"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="6" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="banking.conf" label="green" template_qid="1" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="banking" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/banking"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="7" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="personal.conf" label="yellow" template_qid="1" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="personal" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/personal"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="8" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="untrusted.conf" label="red" template_qid="1" kernelopts="" memory="400" default_user="user" netvm_qid="12" uses_default_netvm="False" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="untrusted" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/untrusted"/>
-  <QubesTemplateVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="9" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="test-template-clone.conf" label="green" template_qid="none" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="test-template-clone" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/vm-templates/test-template-clone"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="10" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="test-custom-template-appvm.conf" label="yellow" template_qid="9" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="test-custom-template-appvm" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/test-custom-template-appvm"/>
-  <QubesAppVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="11" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="test-standalonevm.conf" label="blue" template_qid="none" kernelopts="" memory="400" default_user="user" netvm_qid="3" uses_default_netvm="True" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="test-standalonevm" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/appvms/test-standalonevm"/>
-  <QubesProxyVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="12" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="test-testproxy.conf" label="red" template_qid="1" kernelopts="" memory="200" default_user="user" netvm_qid="3" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="test-testproxy" netid="3" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/servicevms/test-testproxy"/>
-  <QubesProxyVm installed_by_rpm="False" kernel="3.7.6-2" uses_default_kernelopts="True" qid="13" include_in_backups="True" uses_default_kernel="True" qrexec_timeout="60" internal="False" conf_file="testproxy2.conf" label="red" template_qid="9" kernelopts="" memory="200" default_user="user" netvm_qid="2" volatile_img="volatile.img" services="{'meminfo-writer': True}" maxmem="1535" pcidevs="[]" name="testproxy2" netid="4" private_img="private.img" vcpus="2" root_img="root.img" debug="False" dir_path="/var/lib/qubes/servicevms/testproxy2"/>
-  <QubesHVm installed_by_rpm="False" netvm_qid="none" qid="14" include_in_backups="True" timezone="localtime" qrexec_timeout="60" conf_file="test-testhvm.conf" label="purple" template_qid="none" internal="False" memory="512" uses_default_netvm="True" services="{'meminfo-writer': False}" default_user="user" pcidevs="[]" name="test-testhvm" qrexec_installed="False" private_img="private.img" drive="None" vcpus="2" root_img="root.img" guiagent_installed="False" debug="False" dir_path="/var/lib/qubes/appvms/test-testhvm"/>
-  <QubesDisposableVm dispid="50" firewall_conf="firewall.xml" label="red" name="disp50" netvm_qid="2" qid="15" template_qid="1"/>
-</QubesVmCollection>
-'''
 
 QUBESXML_R2 = '''
 <QubesVmCollection updatevm="3" default_kernel="3.7.6-2" default_netvm="3" default_fw_netvm="2" default_template="1" clockvm="2">
@@ -129,10 +110,6 @@ X-Qubes-VmName=%VMNAME%
 Icon=%VMDIR%/icon.png
 '''
 
-QUBESXML_R1 = '''<?xml version='1.0' encoding='UTF-8'?>
-<QubesVmCollection clockvm="2" default_fw_netvm="2" default_kernel="3.2.7-10" default_netvm="3" default_template="1" updatevm="3"><QubesTemplateVm conf_file="fedora-17-x64.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/vm-templates/fedora-17-x64" include_in_backups="True" installed_by_rpm="True" internal="False" kernel="3.2.7-10" kernelopts="" label="gray" maxmem="4063" memory="400" name="fedora-17-x64" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="1" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="none" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesNetVm conf_file="netvm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/servicevms/netvm" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="iommu=soft swiotlb=2048" label="red" maxmem="4063" memory="200" name="netvm" netid="1" pcidevs="[&apos;00:19.0&apos;, &apos;03:00.0&apos;]" private_img="private.img" qid="2" root_img="root.img" services="{&apos;ntpd&apos;: False, &apos;meminfo-writer&apos;: False}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" vcpus="2" volatile_img="volatile.img" /><QubesProxyVm conf_file="firewallvm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/servicevms/firewallvm" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="green" maxmem="4063" memory="200" name="firewallvm" netid="2" netvm_qid="2" pcidevs="[]" private_img="private.img" qid="3" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="fedora-17-x64-dvm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/fedora-17-x64-dvm" include_in_backups="True" installed_by_rpm="False" internal="True" kernel="3.2.7-10" kernelopts="" label="gray" maxmem="4063" memory="400" name="fedora-17-x64-dvm" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="4" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="1" volatile_img="volatile.img" /><QubesAppVm conf_file="test-work.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/test-work" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="green" maxmem="4063" memory="400" name="test-work" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="5" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="personal.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/personal" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="yellow" maxmem="4063" memory="400" name="personal" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="6" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="banking.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/banking" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="green" maxmem="4063" memory="400" name="banking" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="7" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="untrusted.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/untrusted" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="red" maxmem="4063" memory="400" name="untrusted" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="8" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="test-standalonevm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/test-standalonevm" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="None" kernelopts="" label="red" maxmem="4063" memory="400" name="test-standalonevm" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="9" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="none" uses_default_kernel="False" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="test-testvm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/test-testvm" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="red" mac="00:16:3E:5E:6C:55" maxmem="4063" memory="400" name="test-testvm" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="10" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesTemplateVm conf_file="test-template-clone.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/vm-templates/test-template-clone" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="gray" maxmem="4063" memory="400" name="test-template-clone" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="11" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="none" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesAppVm conf_file="test-custom-template-appvm.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/appvms/test-custom-template-appvm" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="yellow" maxmem="4063" memory="400" name="test-custom-template-appvm" netvm_qid="3" pcidevs="[]" private_img="private.img" qid="12" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="11" uses_default_kernel="True" uses_default_kernelopts="True" uses_default_netvm="True" vcpus="2" volatile_img="volatile.img" /><QubesProxyVm conf_file="test-testproxy.conf" debug="False" default_user="user" dir_path="/var/lib/qubes/servicevms/test-testproxy" include_in_backups="True" installed_by_rpm="False" internal="False" kernel="3.2.7-10" kernelopts="" label="yellow" maxmem="4063" memory="200" name="test-testproxy" netid="3" netvm_qid="2" pcidevs="[]" private_img="private.img" qid="13" root_img="root.img" services="{&apos;meminfo-writer&apos;: True}" template_qid="1" uses_default_kernel="True" uses_default_kernelopts="True" vcpus="2" volatile_img="volatile.img" /></QubesVmCollection>
-'''
-
 BACKUP_HEADER_R2 = '''version=3
 hmac-algorithm=SHA512
 crypto-algorithm=aes-256-cbc
@@ -409,6 +386,9 @@ class TC_00_BackupCompatibility(
             for prop, value in kwargs.items():
                 if prop == 'klass':
                     self.assertIsInstance(vm, value)
+                elif prop == 'features':
+                    self.assertEqual(dict(vm.features), value,
+                        'VM {} - features mismatch'.format(vm.name))
                 elif value is qubes.property.DEFAULT:
                     self.assertTrue(vm.property_is_default(prop),
                         'VM {} - property {} not default'.format(vm.name, prop))
@@ -424,120 +404,6 @@ class TC_00_BackupCompatibility(
                         self.assertEqual(value, actual_value,
                             'VM {} - property {}'.format(vm.name, prop))
 
-    def test_100_r1(self):
-        self.create_v1_files(r2b2=False)
-
-        f = open(self.fullpath("qubes.xml"), "w")
-        f.write(QUBESXML_R1)
-        f.close()
-
-        self.restore_backup(self.backupdir,
-            options={
-                'use-default-template': True,
-                'use-default-netvm': True,
-            },
-        )
-        common_props = {
-            'installed_by_rpm': False,
-            'kernel': qubes.property.DEFAULT,
-            'kernelopts': qubes.property.DEFAULT,
-            'qrexec_timeout': qubes.property.DEFAULT,
-            'netvm': qubes.property.DEFAULT,
-            'default_user': qubes.property.DEFAULT,
-            'internal': qubes.property.DEFAULT,
-            'include_in_backups': True,
-            'debug': False,
-            'maxmem': 4000,  # 4063 caped by 10*400
-            'memory': 400,
-        }
-        self.assertRestored("test-template-clone",
-            klass=qubes.vm.templatevm.TemplateVM,
-            label='gray',
-            provides_network=False,
-            **common_props)
-        testproxy_props = common_props.copy()
-        testproxy_props.update(
-            label='yellow',
-            provides_network=True,
-            memory=200,
-            maxmem=2000,
-            template=self.app.default_template.name,
-        )
-        self.assertRestored("test-testproxy",
-            klass=qubes.vm.appvm.AppVM,
-            **testproxy_props)
-        self.assertRestored("test-work",
-            klass=qubes.vm.appvm.AppVM,
-            template=self.app.default_template.name,
-            label='green',
-            **common_props)
-        self.assertRestored("test-standalonevm",
-            klass=qubes.vm.standalonevm.StandaloneVM,
-            label='red',
-            **common_props)
-        self.assertRestored("test-custom-template-appvm",
-            klass=qubes.vm.appvm.AppVM,
-            template='test-template-clone',
-            label='yellow',
-            **common_props)
-
-    def test_200_r2b2(self):
-        self.create_v1_files(r2b2=True)
-
-        f = open(self.fullpath("qubes.xml"), "w")
-        f.write(QUBESXML_R2B2)
-        f.close()
-
-        self.restore_backup(self.backupdir, options={
-            'use-default-template': True,
-            'use-default-netvm': True,
-        })
-        common_props = {
-            'installed_by_rpm': False,
-            'kernel': qubes.property.DEFAULT,
-            'kernelopts': qubes.property.DEFAULT,
-            'qrexec_timeout': qubes.property.DEFAULT,
-            'netvm': qubes.property.DEFAULT,
-            'default_user': qubes.property.DEFAULT,
-            'internal': qubes.property.DEFAULT,
-            'include_in_backups': True,
-            'debug': False,
-            'maxmem': 1535,
-            'memory': 400,
-        }
-        template_clone_props = common_props.copy()
-        template_clone_props.update(
-            label='green',
-            provides_network=False,
-        )
-        self.assertRestored("test-template-clone",
-            klass=qubes.vm.templatevm.TemplateVM,
-            **template_clone_props)
-        testproxy_props = common_props.copy()
-        testproxy_props.update(
-            label='red',
-            provides_network=True,
-            memory=200,
-            template=self.app.default_template.name,
-        )
-        self.assertRestored("test-testproxy",
-            klass=qubes.vm.appvm.AppVM,
-            **testproxy_props)
-        self.assertRestored("test-work",
-            klass=qubes.vm.appvm.AppVM,
-            template=self.app.default_template.name,
-            label='green',
-            **common_props)
-        self.assertRestored("test-standalonevm",
-            klass=qubes.vm.standalonevm.StandaloneVM,
-            label='blue',
-            **common_props)
-        self.assertRestored("test-custom-template-appvm",
-            klass=qubes.vm.appvm.AppVM,
-            template='test-template-clone',
-            label='yellow',
-            **common_props)
-
     def test_210_r2(self):
         self.create_v3_backup(False)
 
@@ -552,17 +418,25 @@ class TC_00_BackupCompatibility(
             'qrexec_timeout': qubes.property.DEFAULT,
             'netvm': qubes.property.DEFAULT,
             'default_user': qubes.property.DEFAULT,
-            'internal': qubes.property.DEFAULT,
             'include_in_backups': True,
             'debug': False,
             'maxmem': 1535,
             'memory': 400,
+            'features': {
+                'service.meminfo-writer': '1',
+            },
+        }
+        template_standalone_props = common_props.copy()
+        template_standalone_props['features'] = {
+            'qrexec': '1',
+            'gui': '1',
+            'service.meminfo-writer': '1',
         }
         self.assertRestored("test-template-clone",
             klass=qubes.vm.templatevm.TemplateVM,
             label='green',
             provides_network=False,
-            **common_props)
+            **template_standalone_props)
         testproxy_props = common_props.copy()
         testproxy_props.update(
             label='red',
@@ -581,7 +455,7 @@ class TC_00_BackupCompatibility(
         self.assertRestored("test-standalonevm",
             klass=qubes.vm.standalonevm.StandaloneVM,
             label='blue',
-            **common_props)
+            **template_standalone_props)
         self.assertRestored("test-custom-template-appvm",
             klass=qubes.vm.appvm.AppVM,
             template='test-template-clone',
@@ -602,17 +476,25 @@ class TC_00_BackupCompatibility(
             'qrexec_timeout': qubes.property.DEFAULT,
             'netvm': qubes.property.DEFAULT,
             'default_user': qubes.property.DEFAULT,
-            'internal': qubes.property.DEFAULT,
             'include_in_backups': True,
             'debug': False,
             'maxmem': 1535,  # 4063 caped by 10*400
             'memory': 400,
+            'features': {
+                'service.meminfo-writer': '1',
+            },
+        }
+        template_standalone_props = common_props.copy()
+        template_standalone_props['features'] = {
+            'qrexec': '1',
+            'gui': '1',
+            'service.meminfo-writer': '1',
         }
         self.assertRestored("test-template-clone",
             klass=qubes.vm.templatevm.TemplateVM,
             label='green',
             provides_network=False,
-            **common_props)
+            **template_standalone_props)
         testproxy_props = common_props.copy()
         testproxy_props.update(
             label='red',
@@ -631,7 +513,7 @@ class TC_00_BackupCompatibility(
         self.assertRestored("test-standalonevm",
             klass=qubes.vm.standalonevm.StandaloneVM,
             label='blue',
-            **common_props)
+            **template_standalone_props)
         self.assertRestored("test-custom-template-appvm",
             klass=qubes.vm.appvm.AppVM,
             template='test-template-clone',
@@ -645,9 +527,9 @@ class TC_01_BackupCompatibilityIntoLVM(TC_00_BackupCompatibility):
         self.init_lvm_pool()
 
     def restore_backup(self, source=None, appvm=None, options=None,
-            expect_errors=None, manipulate_restore_info=None):
+            **kwargs):
         if options is None:
             options = {}
         options['override_pool'] = self.pool.name
         super(TC_01_BackupCompatibilityIntoLVM, self).restore_backup(source,
-            appvm, options, expect_errors, manipulate_restore_info)
+            appvm, options, **kwargs)
diff --git a/qubes/tests/integ/dispvm.py b/qubes/tests/integ/dispvm.py
index 7d1ac05c..10aa1e66 100644
--- a/qubes/tests/integ/dispvm.py
+++ b/qubes/tests/integ/dispvm.py
@@ -147,8 +147,11 @@ class TC_20_DispVMMixin(object):
             self.assertTrue(dispvm.is_running())
             try:
                 window_title = 'user@%s' % (dispvm.name,)
+                # close xterm on Return, but after short delay, to allow
+                # xdotool to send also keyup event
                 p.stdin.write("xterm -e "
-                    "\"sh -c 'echo \\\"\033]0;{}\007\\\";read x;'\"\n".
+                    "\"sh -c 'echo \\\"\033]0;{}\007\\\";read x;"
+                              "sleep 0.1;'\"\n".
                     format(window_title).encode())
                 self.loop.run_until_complete(p.stdin.drain())
                 self.wait_for_window(window_title)
diff --git a/qubes/vm/qubesvm.py b/qubes/vm/qubesvm.py
index e844d684..e093fbe8 100644
--- a/qubes/vm/qubesvm.py
+++ b/qubes/vm/qubesvm.py
@@ -897,6 +897,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
                     libvirt.VIR_DOMAIN_START_PAUSED)
 
             except Exception as exc:
+                self.log.error('Start failed: %s', str(exc))
                 # let anyone receiving domain-pre-start know that startup failed
                 yield from self.fire_event_async('domain-start-failed',
                     reason=str(exc))
@@ -928,6 +929,7 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
                     start_guid=start_guid)
 
             except Exception as exc:  # pylint: disable=bare-except
+                self.log.error('Start failed: %s', str(exc))
                 if self.is_running() or self.is_paused():
                     # This avoids losing the exception if an exception is
                     # raised in self.force_shutdown(), because the vm is not
diff --git a/qubespolicy/__init__.py b/qubespolicy/__init__.py
index 4b000e55..72339548 100755
--- a/qubespolicy/__init__.py
+++ b/qubespolicy/__init__.py
@@ -617,6 +617,11 @@ class Policy(object):
                 if verify_target_value(system_info, dispvm):
                     targets.add(dispvm)
 
+        # expand other keywords
+        if '$adminvm' in targets:
+            targets.remove('$adminvm')
+            targets.add('dom0')
+
         return targets
 
     def evaluate(self, system_info, source, target):
diff --git a/qubespolicy/tests/__init__.py b/qubespolicy/tests/__init__.py
index e18237a5..939a509c 100644
--- a/qubespolicy/tests/__init__.py
+++ b/qubespolicy/tests/__init__.py
@@ -685,6 +685,7 @@ class TC_20_Policy(qubes.tests.QubesTestCase):
             f.write('$tag:tag1 $type:AppVM allow\n')
             f.write('test-no-dvm $dispvm allow\n')
             f.write('test-standalone $dispvm allow\n')
+            f.write('test-standalone $adminvm allow\n')
         policy = qubespolicy.Policy('test.service', tmp_policy_dir)
         self.assertCountEqual(policy.collect_targets_for_ask(system_info,
             'test-vm1'), ['test-vm1', 'test-vm2', 'test-vm3',
@@ -698,7 +699,7 @@ class TC_20_Policy(qubes.tests.QubesTestCase):
         self.assertCountEqual(policy.collect_targets_for_ask(system_info,
             'test-standalone'), ['test-vm1', 'test-vm2', 'test-vm3',
             'default-dvm', 'test-no-dvm', 'test-invalid-dvm',
-            '$dispvm:default-dvm'])
+            '$dispvm:default-dvm', 'dom0'])
         self.assertCountEqual(policy.collect_targets_for_ask(system_info,
             'test-no-dvm'), [])