diff --git a/behat/features/wysiwyg_media.feature b/behat/features/wysiwyg_media.feature
index 368b6cf..530f886 100644
--- a/behat/features/wysiwyg_media.feature
+++ b/behat/features/wysiwyg_media.feature
@@ -126,6 +126,7 @@ Feature: Add media using the rich text editor
     # See the image with the 2nd alt text.
     Then I should see the "img" element in the "Bryant Content" region
       And I should see the image alt "Alt & some > \"character's\" <" in the "Bryant Content" region
+    When I take a screenshot
     # Next, we edit the node again, so we can verify that the second
     # alt text will load when editing the image again.
     When I click "Edit" in the "Tabs" region
diff --git a/behat/steps/panopoly_test.behat.inc b/behat/steps/panopoly_test.behat.inc
index 01fb66b..3e93f16 100644
--- a/behat/steps/panopoly_test.behat.inc
+++ b/behat/steps/panopoly_test.behat.inc
@@ -142,27 +142,43 @@ class TestSubContext extends RawDrupalContext implements DrupalSubContextInterfa
   }
 
   /**
+   * Explicitly take a screenshot.
+   *
+   * @Given I take a screenshot
+   */
+  public function takeScreenshot($title = NULL) {
+    static $title = 0;
+
+    $driver = $this->getSession()->getDriver();
+
+    // Get the screenshot if the driver supports it.
+    try {
+      $image = $driver->getScreenshot();
+    }
+    catch (UnsupportedDriverActionException $e) {
+      return;
+    }
+
+    // Set default title.
+    if (!$title) {
+      $title = 'screenshot-' . (++$title);
+    }
+
+    // Upload the image.
+    $url = $this->uploadScreenshot($image, $title, $imgur_client_id);
+    // @todo Is there a Behat API we can use to write to the screen?
+    print "Screenshot uploaded to $url\n";
+  }
+
+  /**
    * After a failed step, upload a screenshot.
    *
    * @AfterStep
    */
   public function afterStepTakeScreenshot($event) {
     if ($event->getTestResult()->getResultCode() === TestResult::FAILED && ($imgur_client_id = getenv('IMGUR_CLIENT_ID')))  {
-      $driver = $this->getSession()->getDriver();
-
-      // Get the screenshot if the driver supports it.
-      try {
-        $image = $driver->getScreenshot();
-      }
-      catch (UnsupportedDriverActionException $e) {
-        return;
-      }
-
-      // Upload the image.
       $title = preg_replace('/[^a-zA-Z0-9\._-]/', '_', $event->getStep()->getText());
-      $url = $this->uploadScreenshot($image, $title, $imgur_client_id);
-      // @todo Is there a Behat API we can use to write to the screen?
-      print "Screenshot uploaded to $url\n";
+      $this->takeScreenshot($title);
     }
   }