diff --git a/tests/behat/behat.template.yml b/tests/behat/behat.template.yml
index 419f221..451bd1c 100644
--- a/tests/behat/behat.template.yml
+++ b/tests/behat/behat.template.yml
@@ -15,6 +15,9 @@ default:
         drupal_root: '/path/to/drupal/root'
       api_driver: 'drupal'
       region_map:
+        # The region on panopoly_page where the body appears (frequently
+        # customized on child distributions).
+        Panopoly Page Content: '.bryant-content'
         # Regions for Panopoly Layouts
         Boxton Content: ".boxton-content"
         Bryant Content: ".bryant-content"
diff --git a/tests/behat/behat.travis.yml b/tests/behat/behat.travis.yml
index d688cfe..5e1e1e3 100644
--- a/tests/behat/behat.travis.yml
+++ b/tests/behat/behat.travis.yml
@@ -19,6 +19,9 @@ default:
       #  drupal_root: "/path/to/drupal/root"
       api_driver: 'drupal'
       region_map:
+        # The region on panopoly_page where the body appears (frequently
+        # customized on child distributions).
+        Panopoly Page Content: '.bryant-content'
         # Regions for Panopoly Layouts
         Boxton Content: ".boxton-content"
         Bryant Content: ".bryant-content"
diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
index bb9341f..38007cf 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -28,7 +28,7 @@ class FeatureContext extends DrupalContext
 
   /**
    * Initializes context.
-   * Every scenario gets it's own context object.
+   * Every scenario gets its own context object.
    *
    * @param array $parameters context parameters (set them up through behat.yml)
    */
diff --git a/tests/behat/features/contentitem_widget.feature b/tests/behat/features/contentitem_widget.feature
index b18d25e..0847618 100644
--- a/tests/behat/features/contentitem_widget.feature
+++ b/tests/behat/features/contentitem_widget.feature
@@ -3,22 +3,25 @@ Feature: Add content item
   As a site administrator
   I need to be able to choose which content item
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add content item
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
+      And "panopoly_test_page" nodes:
+      | title       | body      | created            | status |
+      | Test Page 1 | Test body | 01/01/2001 11:00am |      1 |
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add content item"
+      And I click "Add content item" in the "CTools modal" region
     Then I should see "Configure new Add content item"
     When I fill in the following:
-      | exposed[title]        | Lovely Vegetables  |
-    When I select "Content Page" from "exposed[type]"
+      | exposed[title]        | Test Page 1 |
+    When I select "Test Page" from "exposed[type]"
       And I press "Save" in the "CTools modal" region
       And I press "Save"
       And I wait for the Panels IPE to deactivate
-    Then I should see "Lovely Vegetables"
-      And I should see "January 11, 2012"
-      And I should see "Posted by admin"
+    Then I should see "Test Page 1"
+      And I should see "January 1, 2001"
+      And I should see "Posted by Anonymous"
 
diff --git a/tests/behat/features/contentlist_widget.feature b/tests/behat/features/contentlist_widget.feature
index 292d9b1..38541ac 100644
--- a/tests/behat/features/contentlist_widget.feature
+++ b/tests/behat/features/contentlist_widget.feature
@@ -3,28 +3,37 @@ Feature: Add content list widget
   As a site administrator
   I need to be able to add a list with the content I choose
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add a content list
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
+      And "panopoly_test_page" nodes:
+      | title       | body      | created            | status |
+      | Test Page 3 | Test body | 01/01/2001 11:00am |      1 |
+      | Test Page 1 | Test body | 01/02/2001 11:00am |      1 |
+      | Test Page 2 | Test body | 01/03/2001 11:00am |      1 |
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add content list"
+      And I click "Add content list" in the "CTools modal" region
     Then I should see "Configure new Add content list"
       When I fill in the following:
        | widget_title    | Content Page List Asc 1 |
        | items_per_page  | 1                       |
 #      | Display Type    | Fields                  |
-    When I select "Content Page" from "exposed[type]"
+    When I select "Test Page" from "exposed[type]"
       And I select "Asc" from "exposed[sort_order]"
       And I select "Title" from "exposed[sort_by]"
+      And I wait 5 seconds
       And I press "Save" in the "CTools modal" region
       And I press "Save"
       And I wait for the Panels IPE to deactivate
+      And I wait 5 seconds
     Then I should see "Content Page List Asc 1"
-    Then I should see "March 20, 2012"
-      And I should see "Posted by admin"
+      And I should see "Test Page 1"
+      And I should see "January 2, 2001"
+      And I should see "Posted by Anonymous"
+    # Check that 'Sort by' stays set, per #2153291
     When I customize this page with the Panels IPE
      And I click "Settings" in the "Boxton Content" region
     Then I should see "Configure Add content list"
diff --git a/tests/behat/features/contentpage.feature b/tests/behat/features/contentpage.feature
index 1fda335..091af85 100644
--- a/tests/behat/features/contentpage.feature
+++ b/tests/behat/features/contentpage.feature
@@ -12,17 +12,20 @@ Feature: Add content page
         | Editor              | plain_text    |
         | body[und][0][value] | Testing body  |
 
-  @api
+  @api @panopoly_pages
   Scenario: Add a content page
-    When I press "Publish"
+    # Normally, here we'd press "Publish", however some child distribtions
+    # don't use 'save_draft', and this makes this test compatible with them.
+    #When I press "Publish"
+    When I press "edit-submit"
     Then the "h1" element should contain "Testing title"
 
-  @api @javascript
+  @api @javascript @panopoly_pages
   Scenario: Add a Featured Image with incorrect dimensions
     When I attach the file "panopoly.png" to "files[field_featured_image_und_0]"
     Then I should see "The specified file panopoly.png could not be uploaded. The image is too small; the minimum dimensions are 300x200 pixels."
 
-  @api @javascript
+  @api @javascript @panopoly_pages
   Scenario: Add a Featured image
     # Revisting the page will not be necessary when https://drupal.org/node/2281709 is resolved
     When I visit "/node/add/panopoly-page"
@@ -33,7 +36,8 @@ Feature: Add content page
       And I attach the file "screenshot.png" to "files[field_featured_image_und_0]"
     Then I should not see "The specified file panopoly.png could not be uploaded. The image is too small; the minimum dimensions are 300x200 pixels."
     When I fill in "Alt Text" with "Panopoly rocks"
-      And I press "Publish"
+      #And I press "Publish"
+      And I press "edit-submit"
     Then I should see the link "Edit" in the "Tabs" region
     When I click "Edit" in the "Tabs" region
     Then the "field_featured_image[und][0][alt]" field should contain "Panopoly rocks"
diff --git a/tests/behat/features/demo.feature b/tests/behat/features/demo.feature
index 5ef5b94..3620402 100644
--- a/tests/behat/features/demo.feature
+++ b/tests/behat/features/demo.feature
@@ -3,6 +3,7 @@ Feature: Demo content
   As a site owner
   I need to view demo content
 
+  @panopoly_demo
   Scenario: Homepage
     Given I am an anonymous user
     When I visit "/"
diff --git a/tests/behat/features/file_widget.feature b/tests/behat/features/file_widget.feature
index c1dba05..470f2a7 100644
--- a/tests/behat/features/file_widget.feature
+++ b/tests/behat/features/file_widget.feature
@@ -9,10 +9,10 @@ Feature: Add a file to a page
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add file"
+      And I click "Add file" in the "CTools modal" region
     Then I should see "Configure new Add file"
 
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add a spotlight
     Then I should see "Allowed file types: pdf txt."
     When I fill in the following:
diff --git a/tests/behat/features/image_widget.feature b/tests/behat/features/image_widget.feature
index 9cad0d7..80adf09 100644
--- a/tests/behat/features/image_widget.feature
+++ b/tests/behat/features/image_widget.feature
@@ -3,14 +3,14 @@ Feature: Add image widget
   As a site administrator
   I need to be able to use the image widget
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add a image
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add image"
+      And I click "Add image" in the "CTools modal" region
     Then I should see "Configure new Add image"
     When I fill in the following:
       | Title   | Testing image widget title |
diff --git a/tests/behat/features/landingpage.feature b/tests/behat/features/landingpage.feature
index 3233a3a..e9320e8 100644
--- a/tests/behat/features/landingpage.feature
+++ b/tests/behat/features/landingpage.feature
@@ -4,7 +4,7 @@ Feature: Add landing page
   I need to be able to create a landing page
 
   # @javascript is needed for the machine name
-  @api @javascript
+  @api @javascript @panopoly_pages
   Scenario: Add a landing page
     Given I am logged in as a user with the "administrator" role
     When I visit "/node/add/landing_page"
diff --git a/tests/behat/features/linkit.feature b/tests/behat/features/linkit.feature
index 3d7fa70..b2cc21f 100644
--- a/tests/behat/features/linkit.feature
+++ b/tests/behat/features/linkit.feature
@@ -6,12 +6,12 @@ Feature: Link to page on the site
   Background:
     Given I am logged in as a user with the "administrator" role
       And a "panopoly_page" node with the title "Linkit Target"
-    When I visit "/node/add/panopoly-page"
+    When I visit "/node/add/panopoly-test-page"
       And I fill in the following:
-        | Title                | Testing Linkit       |
-        | body[und][0][format] | panopoly_wysiwyg_text |
+        | Title  | Testing Linkit       |
+        | Editor | panopoly_wysiwyg_text |
 
-  @api @javascript
+  @api @javascript @panopoly_wysiwyg
   Scenario: Add a link to an internal page
     When I click the "Linkit" button in the "edit-body-und-0-value" WYSIWYG editor
       And I fill in "edit-linkit-search" with "target"
@@ -21,19 +21,25 @@ Feature: Link to page on the site
     When I click "Attributes"
       And I fill in "edit-linkit-title" with "Testing title"
       And I press "Insert link"
-      And I press "Publish"
+      # Normally, here we'd press "Publish", however some child distribtions
+      # don't use 'save_draft', and this makes this test compatible with them.
+      #And I press "Publish"
+      And I press "edit-submit"
     Then I should see "Linkit Target" in the "a" element with the "title" attribute set to "Testing title" in the "Bryant Content" region
     When I click "Linkit Target"
     Then the "h1" element should contain "Linkit Target"
 
-  @api @javascript
+  @api @javascript @panopoly_wysiwyg
   Scenario: Add a link to an external page
     When I click the "Linkit" button in the "edit-body-und-0-value" WYSIWYG editor
       And I fill in "edit-linkit-path" with "https://drupal.org/project/panopoly"
       And I click "Attributes"
       And I fill in "edit-linkit-title" with "Testing title"
       And I press "Insert link"
-      And I press "Publish"
+      # Normally, here we'd press "Publish", however some child distribtions
+      # don't use 'save_draft', and this makes this test compatible with them.
+      #And I press "Publish"
+      And I press "edit-submit"
     Then I should see "https://drupal.org/project/panopoly" in the "a" element with the "title" attribute set to "Testing title" in the "Bryant Content" region
     When I click "https://drupal.org/project/panopoly"
     Then the "h1" element should contain "Panopoly"
diff --git a/tests/behat/features/links_widget.feature b/tests/behat/features/links_widget.feature
index 9984810..da09348 100644
--- a/tests/behat/features/links_widget.feature
+++ b/tests/behat/features/links_widget.feature
@@ -3,14 +3,14 @@ Feature: Add links widget
   As a site administrator
   I need to be able to use the links widget
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add links
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add links"
+      And I click "Add links" in the "CTools modal" region
     Then I should see "Configure new Add links"
     When I fill in the following:
       | title                                  | Testing link title  |      
diff --git a/tests/behat/features/livepreview.feature b/tests/behat/features/livepreview.feature
index 542afee..1c71ff8 100644
--- a/tests/behat/features/livepreview.feature
+++ b/tests/behat/features/livepreview.feature
@@ -3,14 +3,14 @@ Feature: Live preview
   As a site administrator
   I need to be able to have a live preview of my changes to the widgets
 
-  @api @javascript
+  @api @javascript @panopoly_magic @panopoly_widgets
   Scenario: Automatic live preview should show changes immediately
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are automatic
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add table"
+      And I click "Add table" in the "CTools modal" region
     Then I should see "Configure new Add table"
     When I fill in "Title" with "Widget title"
       And I wait for live preview to finish
@@ -36,14 +36,19 @@ Feature: Live preview
       And I should see "c-1-r-1"
       And I should see "c-2-r-1"
 
-  @api @javascript
+  @api @javascript @panopoly_magic @panopoly_widgets
   Scenario: Live preview should work with views
     Given I am logged in as a user with the "administrator" role
+      And "panopoly_test_page" nodes:
+      | title       | body      | created            | status |
+      | Test Page 3 | Test body | 01/01/2001 11:00am |      1 |
+      | Test Page 1 | Test body | 01/02/2001 11:00am |      1 |
+      | Test Page 2 | Test body | 01/03/2001 11:00am |      1 |
       And Panopoly magic live previews are automatic
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add content list"
+      And I click "Add content list" in the "CTools modal" region
     Then I should see "Configure new Add content list"
     When I fill in "widget_title" with "Content list widget"
       And I wait for live preview to finish
@@ -51,26 +56,26 @@ Feature: Live preview
     # @todo: we need to test switching the content type, but there's only
     # one included with our demo data.
     # Test changing the "Items to Show".
-    When I select "Content Page" from "exposed[type]"
+    When I select "Test Page" from "exposed[type]"
       And I wait for live preview to finish
-    Then I should see the link "Content Demo" in the "Live preview" region
-      And I should see the link "Lovely Vegetables" in the "Live preview" region
-      And I should see the link "Great Vegetables" in the "Live preview" region
+    Then I should see the link "Test Page 1" in the "Live preview" region
+      And I should see the link "Test Page 2" in the "Live preview" region
+      And I should see the link "Test Page 3" in the "Live preview" region
     When I fill in "items_per_page" with "1"
       And I wait for live preview to finish
-    Then I should see the link "Content Demo" in the "Live preview" region
-      And I should not see the link "Lovely Vegetables" in the "Live preview" region
-      And I should not see the link "Great Vegetables" in the "Live preview" region
+    Then I should see the link "Test Page 2" in the "Live preview" region
+      And I should not see the link "Test Page 1" in the "Live preview" region
+      And I should not see the link "Test Page 3" in the "Live preview" region
     # Test changing the sort order.
     When I fill in "exposed[sort_order]" with "ASC"
       And I wait for live preview to finish
-    Then I should not see the link "Content demo" in the "Live preview" region
-      And I should see the link "Vegetables are Great" in the "Live preview" region
+    Then I should not see the link "Test Page 2" in the "Live preview" region
+      And I should see the link "Test Page 3" in the "Live preview" region
     # Test changing the sort by.
     When I fill in "exposed[sort_by]" with "title"
       And I wait for live preview to finish
-    Then I should not see the link "Vegetables are Great" in the "Live preview" region
-      And I should see the link "Content Demo" in the "Live preview" region
+    Then I should not see the link "Test Page 3" in the "Live preview" region
+      And I should see the link "Test Page 1" in the "Live preview" region
     # Test changing the Display Type to "Content".
     Then I should not see the link "Read more" in the "Live preview" region
     When I select the radio button "Content"
@@ -106,14 +111,14 @@ Feature: Live preview
       And I wait for live preview to finish
     Then I should not see "Posted by" in the "Live preview" region
 
-  @api @javascript
+  @api @javascript @panopoly_magic @panopoly_widgets
   Scenario: Manual live preview should show changes when requested
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are manual
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add text"
+      And I click "Add text" in the "CTools modal" region
     Then I should see "Configure new Add text"
     When I fill in "Title" with "Widget title"
     Then I should not see "Widget title" in the "Live preview" region
@@ -121,14 +126,14 @@ Feature: Live preview
       And I wait for live preview to finish
     Then I should see "Widget title" in the "Live preview" region
 
-  @api @javascript
+  @api @javascript @panopoly_magic @panopoly_widgets
   Scenario: Automatic live preview should validation errors immediately
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are automatic
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add spotlight"
+      And I click "Add spotlight" in the "CTools modal" region
     Then I should see "Configure new Add spotlight"
     When I fill in "Description" with "Testing description"
       And I wait for live preview to finish
diff --git a/tests/behat/features/login.feature b/tests/behat/features/login.feature
index 6b47fc4..19879c2 100644
--- a/tests/behat/features/login.feature
+++ b/tests/behat/features/login.feature
@@ -3,6 +3,7 @@ In order to access content for authenticated users
 As an anonymous user
 I want to be able to login
  
+  @standard_login
   Scenario: Admin user is able to login
     Given I am on "/user"
     When I fill in "admin" for "edit-name"
@@ -10,6 +11,7 @@ I want to be able to login
     And I press "Log in"
     Then I should see "Log out"
 
+  @standard_login
   Scenario: User can request a new password if it has been lost
     Given I am on "/user/login"
     Then I should see "If you forgot your password, request a new password."
@@ -20,7 +22,7 @@ I want to be able to login
     Then I should see "Further instructions have been sent to your e-mail address."
       And I should see "Log in"
 
-  @drush
+  @drush @standard_login
   Scenario: User can change password after using one-time-login-url
     Given I log in with the One Time Login Url
     Then I should see the heading "Reset password"
diff --git a/tests/behat/features/maps_widget.feature b/tests/behat/features/maps_widget.feature
index e4f5516..2cfc082 100644
--- a/tests/behat/features/maps_widget.feature
+++ b/tests/behat/features/maps_widget.feature
@@ -3,14 +3,14 @@ Feature: Add map widget
   As a site administrator
   I need to be able to use the map widget
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add map to a page
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add map"
+      And I click "Add map" in the "CTools modal" region
     Then I should see "Configure new Add map"
     When I fill in the following:
       | Title       | Widget title            |
diff --git a/tests/behat/features/pathauto.feature b/tests/behat/features/pathauto.feature
index 7790ca9..7874800 100644
--- a/tests/behat/features/pathauto.feature
+++ b/tests/behat/features/pathauto.feature
@@ -6,19 +6,22 @@
   Background:
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
-    When I visit "/node/add/panopoly-page"
+    When I visit "/node/add/panopoly-test-page"
       And I fill in the following:
-        | Title               | Testing title |
-        | Editor              | plain_text    |
-        | body[und][0][value] | Testing body  |
-      And I press "Publish"
+        | Title  | Testing title |
+        | Editor | plain_text    |
+        | Body   | Testing body  |
+    # Normally, here we'd press "Publish", however some child distribtions
+    # don't use 'save_draft', and this makes this test compatible with them.
+    #When I press "Publish"
+    When I press "edit-submit"
     Then the "h1" element should contain "Testing title"
 
-  @api
+  @api @panopoly_admin
   Scenario: Pathauto should automatically assign an url
     Then the url should match "testing-title"
   
-  @api
+  @api @panopoly_admin
   Scenario: Pathauto should keep old url when changing the title
     When I click "Edit" in the "Tabs" region
       And I fill in the following:
@@ -28,7 +31,7 @@
     Given I go to "completely-other-title"
     Then the response status code should be 404
   
-  @api
+  @api @panopoly_admin
   Scenario: My own permalink should be kept even if changing title
     When I click "Edit" in the "Tabs" region
       And I fill in the following:
diff --git a/tests/behat/features/spotlight_widget.feature b/tests/behat/features/spotlight_widget.feature
index 1927a44..629bb0a 100644
--- a/tests/behat/features/spotlight_widget.feature
+++ b/tests/behat/features/spotlight_widget.feature
@@ -9,10 +9,10 @@ Feature: Add spotlight widget
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add spotlight"
+      And I click "Add spotlight" in the "CTools modal" region
     Then I should see "Configure new Add spotlight"
 
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add a spotlight
     When I fill in the following:
       | field_basic_spotlight_items[und][0][title] | Testing item title  |
@@ -29,7 +29,7 @@ Feature: Add spotlight widget
       # Per an old bug described in issue #2075903
       And I should not see "Spotlight"
 
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Image is required per issue #2075903
     When I fill in the following:
       | field_basic_spotlight_items[und][0][title] | Testing item title  |
diff --git a/tests/behat/features/table_widget.feature b/tests/behat/features/table_widget.feature
index 136f62c..fffedd4 100644
--- a/tests/behat/features/table_widget.feature
+++ b/tests/behat/features/table_widget.feature
@@ -9,7 +9,7 @@ Feature: Add table widget
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add table"
+      And I click "Add table" in the "CTools modal" region
     Then I should see "Configure new Add table"
 
   @api @javascript
diff --git a/tests/behat/features/text_widget.feature b/tests/behat/features/text_widget.feature
index eb27cd7..32b4f4f 100644
--- a/tests/behat/features/text_widget.feature
+++ b/tests/behat/features/text_widget.feature
@@ -3,14 +3,14 @@ Feature: Add text widget
   As a site administrator
   I need to be able to add a text widget
  
-  @api @javascript
+  @api @javascript @panopoly_widgets
   Scenario: Add text to a page
     Given I am logged in as a user with the "administrator" role
       And Panopoly magic live previews are disabled
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane"
-      And I click "Add text"
+      And I click "Add text" in the "CTools modal" region
     Then I should see "Configure new Add text"
     When I fill in the following:
       | Title   | Text widget title       |
diff --git a/tests/behat/features/video_widget.feature b/tests/behat/features/video_widget.feature
index 0a9db05..cad8879 100644
--- a/tests/behat/features/video_widget.feature
+++ b/tests/behat/features/video_widget.feature
@@ -9,12 +9,12 @@ Feature: Add video widget
       And I am viewing a landing page
     When I customize this page with the Panels IPE
       And I click "Add new pane" in the "Boxton Content" region
-      And I click "Add video"
+      And I click "Add video" in the "CTools modal" region
     Then I should see "Configure new Add video"
 
   # TODO: About 10% of the time this test will hang with Firefox, so for now,
   # we will run in Chrome only on Travis-CI to get consistent builds.
-  @api @javascript @chrome
+  @api @javascript @chrome @panopoly_widgets
   Scenario: Add a YouTube video
     When I fill in "Testing video" for "edit-title"
     When I click "Browse"
@@ -35,7 +35,7 @@ Feature: Add video widget
 
   # TODO: About 10% of the time this test will hang with Firefox, so for now,
   # we will run in Chrome only on Travis-CI to get consistent builds.
-  @api @javascript @chrome
+  @api @javascript @chrome @panopoly_widgets
   Scenario: Add a Vimeo video
     When I fill in "Testing video" for "edit-title"
     When I click "Browse"
diff --git a/tests/behat/features/wysiwyg.feature b/tests/behat/features/wysiwyg.feature
index 77d159a..d109ddd 100644
--- a/tests/behat/features/wysiwyg.feature
+++ b/tests/behat/features/wysiwyg.feature
@@ -5,22 +5,26 @@ Feature: Use rich text editor
 
   Background:
     Given I am logged in as a user with the "administrator" role
-    When I visit "/node/add/panopoly-page"
+    When I visit "/node/add/panopoly-test-page"
       And I fill in the following:
-        | Title                | Testing WYSIWYG       |
-        | body[und][0][format] | panopoly_wysiwyg_text |
+        | Title  | Testing WYSIWYG       |
+        | Editor | panopoly_wysiwyg_text |
 
   # For some inexplicable reason this is necessary on Travis-CI. Without it,
   # the first test always fails: it can't find the "Bryant Content" region.
-  @api
+  @api @panopoly_wysiwyg
   Scenario: Fix issues on Travis-CI (not Chrome)
-    When I press "Publish"
+    # Normally, here we'd press "Publish", however some child distribtions
+    # don't use 'save_draft', and this makes this test compatible with them.
+    #When I press "Publish"
+    When I press "edit-submit"
 
-  @api @javascript
+  @api @javascript @panopoly_wysiwyg
   Scenario Outline: Format text in the editor (first toolbar)
     When I click the "<Action>" button in the "edit-body-und-0-value" WYSIWYG editor
       And I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
-      And I press "Publish"
+      #And I press "Publish"
+      And I press "edit-submit"
     Then I should see "Testing body" in the "<Element>" element with the "<Property>" CSS property set to "<Value>" in the "Bryant Content" region
 
     Examples:
@@ -35,12 +39,13 @@ Feature: Use rich text editor
       | Align Center                  | p          | text-align      | center       |
       | Align Right                   | p          | text-align      | right        |
 
-  @api @javascript
+  @api @javascript @panopoly_wysiwyg
   Scenario Outline: Format text in the editor (advanced toolbar)
     When I expand the toolbar in the "edit-body-und-0-value" WYSIWYG editor
       And I click the "<Action>" button in the "edit-body-und-0-value" WYSIWYG editor
       And I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
-      And I press "Publish"
+      #And I press "Publish"
+      And I press "edit-submit"
     Then I should see "Testing body" in the "<Element>" element with the "<Property>" CSS property set to "<Value>" in the "Bryant Content" region
 
     Examples:
@@ -51,13 +56,14 @@ Feature: Use rich text editor
 
   # Because we start over with the Chrome tests, we need to do this again, but
   # for Chrome. Again, this issue only occurs on Travis-CI.
-  @api @chrome
+  @api @chrome @panopoly_wysiwyg
   Scenario: Fix issues on Travis-CI (on Chrome)
-    When I press "Publish"
+    #When I press "Publish"
+    When I press "edit-submit"
 
   # TODO: About 10% of the time this test will hang with Firefox, so for now,
   # we will run in Chrome only on Travis-CI to get consistent builds.
-  @api @javascript @chrome
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_images
   Scenario: Add an image with format and alt text
     When I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
     # Upload the file.
@@ -85,14 +91,15 @@ Feature: Use rich text editor
       And I click the fake "Submit" button
       And I switch out of all frames
     # Save the whole node.
-    When I press "Publish"
+    #When I press "Publish"
+    When I press "edit-submit"
     # See the image on the view page.
     Then I should see the "img" element in the "Bryant Content" region
       And I should see the image alt "Sample alt text" in the "Bryant Content" region
 
   # TODO: About 10% of the time this test will hang with Firefox, so for now,
   # we will run in Chrome only on Travis-CI to get consistent builds.
-  @api @javascript @chrome
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_widgets
   Scenario: Add a YouTube video
     When I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
     # Upload the file.
@@ -108,13 +115,14 @@ Feature: Use rich text editor
       And I click the fake "Submit" button
       And I switch out of all frames
     # Save the whole node.
-    When I press "Publish"
+    #When I press "Publish"
+    When I press "edit-submit"
     # See the image on the view page.
     Then I should see the "iframe.media-youtube-player" element in the "Bryant Content" region
 
   # TODO: About 10% of the time this test will hang with Firefox, so for now,
   # we will run in Chrome only on Travis-CI to get consistent builds.
-  @api @javascript @chrome
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_widgets
   Scenario: Add a Vimeo video
     When I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
     # Upload the file.
@@ -130,6 +138,7 @@ Feature: Use rich text editor
       And I click the fake "Submit" button
       And I switch out of all frames
     # Save the whole node.
-    When I press "Publish"
+    #When I press "Publish"
+    When I press "edit-submit"
     # See the image on the view page.
     Then I should see the "iframe.media-vimeo-player" element in the "Bryant Content" region
