diff --git a/qubes/tests/__init__.py b/qubes/tests/__init__.py
index 9f8ae25d..f36a91f3 100644
--- a/qubes/tests/__init__.py
+++ b/qubes/tests/__init__.py
@@ -348,6 +348,13 @@ class QubesTestCase(unittest.TestCase):
         except AssertionError as e:
             self.fail(str(e))
 
+    @staticmethod
+    def make_vm_name(name, class_teardown=False):
+        if class_teardown:
+            return CLSVMPREFIX + name
+        else:
+            return VMPREFIX + name
+
 
 class SystemTestsMixin(object):
     """
@@ -431,14 +438,6 @@ class SystemTestsMixin(object):
             return
         cls.remove_test_vms(xmlpath=CLASS_XMLPATH, prefix=CLSVMPREFIX)
 
-    @staticmethod
-    def make_vm_name(name, class_teardown=False):
-        if class_teardown:
-            return CLSVMPREFIX + name
-        else:
-            return VMPREFIX + name
-
-
     @classmethod
     def _remove_vm_qubes(cls, vm):
         vmname = vm.name