diff --git a/rally/plugins/openstack/context/cleanup/admin.py b/rally/plugins/openstack/context/cleanup/admin.py
index 1e1197b6..1f7bd4f5 100644
--- a/rally/plugins/openstack/context/cleanup/admin.py
+++ b/rally/plugins/openstack/context/cleanup/admin.py
@@ -19,6 +19,7 @@ from rally.common.i18n import _
 from rally.common import logging
 from rally.plugins.openstack.cleanup import manager
 from rally.plugins.openstack.context.cleanup import base
+from rally.plugins.openstack import scenario
 from rally.task import context
 
 
@@ -50,4 +51,5 @@ class AdminCleanup(base.CleanupMixin, context.Context):
             admin=self.context["admin"],
             users=self.context.get("users", []),
             api_versions=self.context["config"].get("api_versions"),
+            superclass=scenario.OpenStackScenario,
             task_id=self.context["task"]["uuid"])
diff --git a/tests/unit/plugins/openstack/context/cleanup/test_admin.py b/tests/unit/plugins/openstack/context/cleanup/test_admin.py
index eacb2be1..ee6b068e 100644
--- a/tests/unit/plugins/openstack/context/cleanup/test_admin.py
+++ b/tests/unit/plugins/openstack/context/cleanup/test_admin.py
@@ -19,6 +19,7 @@ import mock
 from rally.common import utils
 from rally.plugins.openstack.context.cleanup import admin
 from rally.plugins.openstack.context.cleanup import base
+from rally.plugins.openstack import scenario
 from tests.unit import test
 
 
@@ -68,6 +69,7 @@ class AdminCleanupTestCase(test.TestCase):
         admin_cleanup.setup()
         admin_cleanup.cleanup()
 
+        mock_itersubclasses.assert_called_once_with(scenario.OpenStackScenario)
         mock_find_resource_managers.assert_called_once_with(("a", "b"), True)
         mock_seek_and_destroy.assert_has_calls([
             mock.call(mock_find_resource_managers.return_value[0],
@@ -118,6 +120,7 @@ class AdminCleanupTestCase(test.TestCase):
         admin_cleanup.setup()
         admin_cleanup.cleanup()
 
+        mock_itersubclasses.assert_called_once_with(scenario.OpenStackScenario)
         mock_find_resource_managers.assert_called_once_with(("a", "b"), True)
         mock_seek_and_destroy.assert_has_calls([
             mock.call(mock_find_resource_managers.return_value[0],