diff --git a/rally-jobs/plugins/fake_plugin.py b/rally-jobs/plugins/fake_plugin.py
index 2076e930..f2abef8f 100644
--- a/rally-jobs/plugins/fake_plugin.py
+++ b/rally-jobs/plugins/fake_plugin.py
@@ -24,6 +24,7 @@ from rally.task import scenario
 from test_relative_import import zzz
 
 
+@scenario.configure(name="FakePlugin.testplugin")
 class FakePlugin(scenario.Scenario):
     """Fake plugin with a scenario."""
 
@@ -35,8 +36,7 @@ class FakePlugin(scenario.Scenario):
     def _test2(self, factor):
         time.sleep(random.random() * factor)
 
-    @scenario.configure()
-    def testplugin(self, factor=1):
+    def run(self, factor=1):
         """Fake scenario.
 
         :param factor: influences the argument value for a time.sleep() call
diff --git a/tests/functional/extra/fake_dir1/fake_plugin1.py b/tests/functional/extra/fake_dir1/fake_plugin1.py
index 2f113fa1..4d2c1a49 100644
--- a/tests/functional/extra/fake_dir1/fake_plugin1.py
+++ b/tests/functional/extra/fake_dir1/fake_plugin1.py
@@ -16,10 +16,9 @@
 from rally.task import scenario
 
 
+@scenario.configure(name="FakeScenarioPlugin1.list")
 class FakeScenarioPlugin1(scenario.Scenario):
-    """Sample fake plugin."""
 
-    @scenario.configure()
-    def list(self):
-        """Fake scenario."""
+    def run(self):
+        """Sample fake scenario."""
         pass
diff --git a/tests/functional/extra/fake_dir2/fake_plugin2.py b/tests/functional/extra/fake_dir2/fake_plugin2.py
index bf70f1c5..e380842c 100644
--- a/tests/functional/extra/fake_dir2/fake_plugin2.py
+++ b/tests/functional/extra/fake_dir2/fake_plugin2.py
@@ -16,10 +16,9 @@
 from rally.task import scenario
 
 
+@scenario.configure(name="FakeScenarioPlugin2.list")
 class FakeScenarioPlugin2(scenario.Scenario):
-    """Sample fake plugin."""
 
-    @scenario.configure()
-    def list(self):
-        """Fake scenario."""
+    def run(self):
+        """Sample fake scenario."""
         pass