diff --git a/tests/extra.py b/qubes/tests/extra.py
similarity index 68%
rename from tests/extra.py
rename to qubes/tests/extra.py
index 31943b3c..c5c44a5a 100644
--- a/tests/extra.py
+++ b/qubes/tests/extra.py
@@ -24,17 +24,14 @@
 
 import pkg_resources
 import qubes.tests
-import qubes.qubes
+import qubes.vm.appvm
+import qubes.vm.templatevm
 
 
-class ExtraTestMixin(qubes.tests.SystemTestsMixin):
+class ExtraTestCase(qubes.tests.SystemTestsMixin, qubes.tests.QubesTestCase):
 
     template = None
 
-    def setUp(self):
-        super(ExtraTestMixin, self).setUp()
-        self.qc.unlock_db()
-
     def create_vms(self, names):
         """
         Create AppVMs for the duration of the test. Will be automatically
@@ -43,52 +40,39 @@ class ExtraTestMixin(qubes.tests.SystemTestsMixin):
         prefixed with some test specific string)
         :return: list of created VM objects
         """
-        self.qc.lock_db_for_writing()
-        self.qc.load()
         if self.template:
-            template = self.qc.get_vm_by_name(self.template)
+            template = self.app.domains[self.template]
         else:
-            template = self.qc.get_default_template()
+            template = self.app.default_template
         for vmname in names:
-            vm = self.qc.add_new_vm("QubesAppVm",
+            vm = self.app.add_new_vm(qubes.vm.appvm.AppVM,
                                     name=self.make_vm_name(vmname),
                                     template=template)
             vm.create_on_disk(verbose=False)
         self.save_and_reload_db()
-        self.qc.unlock_db()
 
         # get objects after reload
         vms = []
         for vmname in names:
-            vms.append(self.qc.get_vm_by_name(self.make_vm_name(vmname)))
+            vms.append(self.app.domains[self.make_vm_name])
         return vms
 
     def enable_network(self):
         """
         Enable access to the network. Must be called before creating VMs.
         """
-        # nothing to do in core2
-        pass
+        self.init_networking()
 
 
 def load_tests(loader, tests, pattern):
     for entry in pkg_resources.iter_entry_points('qubes.tests.extra'):
         for test_case in entry():
-            tests.addTests(loader.loadTestsFromTestCase(
-                type(
-                    entry.name + '_' + test_case.__name__,
-                    (test_case, ExtraTestMixin, qubes.tests.QubesTestCase),
-                    {}
-                )
-            ))
+            tests.addTests(loader.loadTestsFromTestCase(test_case))
 
     try:
-        qc = qubes.qubes.QubesVmCollection()
-        qc.lock_db_for_reading()
-        qc.load()
-        qc.unlock_db()
-        templates = [vm.name for vm in qc.values() if
-                     isinstance(vm, qubes.qubes.QubesTemplateVm)]
+        app = qubes.Qubes()
+        templates = [vm.name for vm in app.domains if
+                     isinstance(vm, qubes.vm.templatevm.TemplateVM)]
     except OSError:
         templates = []
 
@@ -100,8 +84,7 @@ def load_tests(loader, tests, pattern):
                     type(
                         '{}_{}_{}'.format(
                             entry.name, test_case.__name__, template),
-                        (test_case, ExtraTestMixin,
-                         qubes.tests.QubesTestCase),
+                        (test_case,),
                         {'template': template}
                     )
                 ))
diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec
index e1d644e2..a63a42c0 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec
@@ -259,6 +259,7 @@ fi
 %dir %{python_sitelib}/qubes/tests
 %{python_sitelib}/qubes/tests/__init__.py*
 %{python_sitelib}/qubes/tests/run.py*
+%{python_sitelib}/qubes/tests/extra.py*
 
 %{python_sitelib}/qubes/tests/devices.py*
 %{python_sitelib}/qubes/tests/events.py*