diff --git a/core/modules/action/src/Tests/ActionListTest.php b/core/modules/action/src/Tests/ActionListTest.php
new file mode 100644
index 0000000..3c94693
--- /dev/null
+++ b/core/modules/action/src/Tests/ActionListTest.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\action\Tests\ActionListTest.
+ */
+
+namespace Drupal\action\Tests;
+
+use Drupal\system\Entity\Action;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Test behaviors when visiting the action listing page.
+ *
+ * @group action
+ */
+class ActionListTest extends WebTestBase {
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array('action');
+
+  /**
+   * Tests the behavior when there are no actions to list in the admin page.
+   */
+  function testEmptyActionList() {
+    // Create a user with permission to view the actions administration pages.
+    $this->drupalLogin(
+      $this->drupalCreateUser(array('administer actions'))
+    );
+
+    // Ensure the empty text appears on the action list page.
+    $actions = Action::loadMultiple();
+    entity_delete_multiple('action', array_keys($actions));
+    $this->drupalGet('/admin/config/system/actions');
+    $this->assertRaw('There is no Action yet.');
+  }
+}
diff --git a/core/modules/image/src/Tests/ImageAdminStylesTest.php b/core/modules/image/src/Tests/ImageAdminStylesTest.php
index 194c016..28a322d 100644
--- a/core/modules/image/src/Tests/ImageAdminStylesTest.php
+++ b/core/modules/image/src/Tests/ImageAdminStylesTest.php
@@ -273,6 +273,11 @@ function testStyle() {
 
     $this->assertFalse(ImageStyle::load($style_name), format_string('Image style %style successfully deleted.', array('%style' => $style->label())));
 
+    // Ensure the empty text appears on the image style admin page.
+    $styles = ImageStyle::loadMultiple();
+    entity_delete_multiple('image_style', array_keys($styles));
+    $this->drupalGet($admin_path);
+    $this->assertRaw(t('There are currently no styles. <a href="@url">Add a new one</a>.', array('@url' => \Drupal::url('image.style_add'))));
   }
 
   /**