diff --git a/src/Handler.php b/src/Handler.php
index 363376b05f91646f720c22fcadbed55626eb6c09..935f394ee6b13a719b4377f17c150c1256d420f6 100644
--- a/src/Handler.php
+++ b/src/Handler.php
@@ -772,7 +772,9 @@ class Handler extends BaseHandler {
         ],
       ],
       'scenarios' => [
-        'frontpage' => '/',
+        'frontpage' => [
+          'path' => '/',
+        ],
       ],
     ];
   }
diff --git a/templates/tests/backstop/backstop.json.twig b/templates/tests/backstop/backstop.json.twig
index ab4deab35f2cb56ad2221ee70a95a469bd2036a0..e27834610c8810ead0278df8772c716aef9a8fef 100644
--- a/templates/tests/backstop/backstop.json.twig
+++ b/templates/tests/backstop/backstop.json.twig
@@ -15,8 +15,17 @@
 {% set i = 0 %}
 {% for label,path in backstop.scenarios %}
   {% if i > 0 %},{% endif %}{
-    "label": "{{ label }}",
-    "url": "{{ projectprotocol }}://{{ projectdomain }}{{ projectport }}{{ path }}"
+    "label": "{{ label }}"
+    ,"url": "{{ projectprotocol }}://{{ projectdomain }}{{ projectport }}{{ scenario.path }}"
+{% if scenario.selectors %}
+    ,"selectors": ["{{ scenario.selectors|join('","') }}"]
+{% endif %}
+{% if scenario.hideSelectors %}
+    ,"hideSelectors": ["{{ scenario.hideSelectors|join('","') }}"]
+{% endif %}
+{% if scenario.removeSelectors %}
+    ,"removeSelectors": ["{{ scenario.removeSelectors|join('","') }}"]
+{% endif %}
   }
 {% set i = i + 1 %}
 {% endfor %}