diff --git a/tempest/tests/compute/__init__.py b/tempest/tests/compute/__init__.py
index a3c6380..36893e3 100644
--- a/tempest/tests/compute/__init__.py
+++ b/tempest/tests/compute/__init__.py
@@ -21,7 +21,6 @@
 from tempest import clients
 from tempest import config
 from tempest.exceptions import InvalidConfiguration
-from testresources import TestResourceManager
 
 LOG = logging.getLogger(__name__)
 
@@ -79,8 +78,3 @@
                        "tenant or password: alt_tenant_name=%s alt_password=%s"
                        % (user2_tenant_name, user2_password))
                 raise InvalidConfiguration(msg)
-
-
-class ComputeResource(TestResourceManager):
-    def make(self, dependency_resources=None):
-        return generic_setup_package()
diff --git a/tempest/tests/compute/base.py b/tempest/tests/compute/base.py
index 2aae89c..2c6b861 100644
--- a/tempest/tests/compute/base.py
+++ b/tempest/tests/compute/base.py
@@ -38,7 +38,7 @@
                    testresources.ResourcedTestCase):
     """Base test case class for all Compute API tests."""
 
-    resources = [('compute_init', compute.ComputeResource())]
+    conclusion = compute.generic_setup_package()
 
     @classmethod
     def setUpClass(cls):