diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php
index 38007cf..854a5ba 100644
--- a/tests/behat/features/bootstrap/FeatureContext.php
+++ b/tests/behat/features/bootstrap/FeatureContext.php
@@ -219,6 +219,22 @@ class FeatureContext extends DrupalContext
   }
 
   /**
+   * Checks, that the region contains text matching specified pattern.
+   *
+   * @Then /^(?:|I )should see text matching "(?P<pattern>(?:[^"]|\\")*)" in the "(?P<region>[^"]*)"(?:| region)$/
+   */
+  public function assertRegionMatchesText($pattern, $region)
+  {
+    $regionObj = $this->getRegion($region);
+
+    // Find the text within the region
+    $regionText = $regionObj->getText();
+    if (!preg_match($pattern, $regionText)) {
+      throw new \Exception(sprintf("No text matching '%s' was found in the region '%s' on the page %s", $pattern, $region, $this->getSession()->getCurrentUrl()));
+    }
+  }
+
+  /**
    * @Then /^I should see the image alt "(?P<link>[^"]*)" in the "(?P<region>[^"]*)"(?:| region)$/
    */
   public function assertAltRegion($alt, $region) {
diff --git a/tests/behat/features/livepreview.feature b/tests/behat/features/livepreview.feature
index 22d4b95..99e4e52 100644
--- a/tests/behat/features/livepreview.feature
+++ b/tests/behat/features/livepreview.feature
@@ -15,12 +15,14 @@ Feature: Live preview
     When I fill in "Title" with "Widget title"
       And I wait for live preview to finish
     Then I should see "Widget title" in the "Live preview" region
-    When I fill in "tablefield_0_cell_1_0" with "c-1-r-1"
+    When I fill in "tablefield_0_cell_0_0" with "c-1-r-1"
       And I wait for live preview to finish
-    Then I should see "c-1-r-1" in the "Live preview" region
-    When I fill in "tablefield_0_cell_1_1" with "c-2-r-1"
+    # We need to check the table header case insensitively, because it's not
+    # uncommon to make table headers capitalized.
+    Then I should see text matching "/c-1-r-1/i" in the "Live preview" region
+    When I fill in "tablefield_0_cell_0_1" with "c-2-r-1"
       And I wait for live preview to finish
-    Then I should see "c-2-r-1" in the "Live preview" region
+    Then I should see text matching "/c-2-r-1/i" in the "Live preview" region
     # Test that we can make the title into a link
     Then I should not see the link "Widget title" in the "Live preview" region
     When I check the box "Make title a link"
diff --git a/tests/behat/features/wysiwyg.feature b/tests/behat/features/wysiwyg.feature
index 7600247..8089ec7 100644
--- a/tests/behat/features/wysiwyg.feature
+++ b/tests/behat/features/wysiwyg.feature
@@ -63,7 +63,7 @@ Feature: Use rich text editor
 
   # 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 @panopoly_wysiwyg @panopoly_images
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_wysiwyg_image @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.
@@ -99,7 +99,7 @@ Feature: Use rich text editor
 
   # 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 @panopoly_wysiwyg @panopoly_wysiwyg_multimedia @panopoly_widgets
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_wysiwyg_video @panopoly_widgets
   Scenario: Add a YouTube video
     When I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
     # Upload the file.
@@ -122,7 +122,7 @@ Feature: Use rich text editor
 
   # 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 @panopoly_wysiwyg @panopoly_wysiwyg_multimedia @panopoly_widgets
+  @api @javascript @chrome @panopoly_wysiwyg @panopoly_wysiwyg_video @panopoly_widgets
   Scenario: Add a Vimeo video
     When I type "Testing body" in the "edit-body-und-0-value" WYSIWYG editor
     # Upload the file.