diff --git a/src/Tests/CloneTest.php b/src/Tests/CloneTest.php
new file mode 100644
index 00000000..c9b80dbd
--- /dev/null
+++ b/src/Tests/CloneTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Drupal\ds\Tests;
+
+/**
+ * Tests for the manage display tab in Display Suite.
+ *
+ * @group ds
+ */
+class CloneTest extends FastTestBase {
+
+  use DsTestTrait;
+
+  /**
+   * Modules to install.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'node',
+    'user',
+    'comment',
+    'field_ui',
+    'ds',
+  );
+
+  /**
+   * Test adding a cloning a layout.
+   */
+  public function testClone() {
+    // Go to the teaser display mode and select a DS layout.
+    $this->dsSelectLayout([], [], 'admin/structure/types/manage/article/display/teaser');
+    $this->assertText('Two column stacked layout');
+
+    // Go back to the default view mode.
+    $this->drupalGet('admin/structure/types/manage/article/display');
+
+    // Clone layout, this will clone from the teaser view mode.
+    $this->drupalPostForm(NULL, [], 'Clone layout');
+
+    // Check for message.
+    $this->assertText('The layout has been cloned.');
+
+    // Check that this now also has the expected region layout.
+    $this->assertOptionSelected('edit-layout', 'ds_2col_stacked');
+  }
+
+}
diff --git a/src/Tests/FastTestBase.php b/src/Tests/FastTestBase.php
index 5f623037..5ee02fd4 100644
--- a/src/Tests/FastTestBase.php
+++ b/src/Tests/FastTestBase.php
@@ -74,7 +74,7 @@ abstract class FastTestBase extends WebTestBase {
   /**
    * The created user.
    *
-   * @var User
+   * @var \Drupal\user\UserInterface
    */
   protected $adminUser;