diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py
index d1e1cb24..c273e900 100644
--- a/tests/unit/fakes.py
+++ b/tests/unit/fakes.py
@@ -1662,6 +1662,14 @@ class FakeScenario(scenario.Scenario):
         raise multiprocessing.TimeoutError()
 
 
+@scenario.configure(name="classbased.fooscenario")
+class FakeClassBasedScenario(FakeScenario):
+    """Fake class-based scenario."""
+
+    def run(self, *args, **kwargs):
+        pass
+
+
 class FakeTimer(rally_utils.Timer):
 
     def duration(self):
diff --git a/tests/unit/test.py b/tests/unit/test.py
index 7d1ea0ea..461c705f 100644
--- a/tests/unit/test.py
+++ b/tests/unit/test.py
@@ -200,9 +200,6 @@ class FakeClientsScenarioTestCase(ScenarioTestCase):
         self._fake_clients = fakes.FakeClients()
 
 
-def get_test_context():
-    return {
-        "task": {
-            "uuid": str(uuid.uuid4())
-        }
-    }
+def get_test_context(**kwargs):
+    kwargs["task"] = {"uuid": str(uuid.uuid4())}
+    return kwargs