diff --git a/features/layout_data.feature b/features/layout_data.feature
index 78998665..8f085777 100644
--- a/features/layout_data.feature
+++ b/features/layout_data.feature
@@ -35,3 +35,31 @@ Feature: Layout data
     When I run jekyll build
     Then the "_site/index.html" file should exist
     And I should see "page content\n foo: my custom data" in "_site/index.html"
+
+  Scenario: Inherit custom layout data
+    Given I have a _layouts directory
+    And I have a "_layouts/default.html" file with content:
+      """
+      {{ content }} foo: '{{ layout.foo }}'
+      """
+    And I have a "_layouts/special.html" file with content:
+      """
+      ---
+      layout: default
+      foo: my special data
+      ---
+      {{ content }}
+      """
+    And I have a "_layouts/page.html" file with content:
+      """
+      ---
+      layout: default
+      ---
+      {{ content }}
+      """
+    And I have an "index.html" page with layout "special" that contains "page content"
+    And I have an "jekyll.html" page with layout "page" that contains "page content"
+    When I run jekyll build
+    Then the "_site/index.html" file should exist
+    And I should see "page content\n foo: 'my special data'" in "_site/index.html"
+    And I should see "page content\n foo: ''" in "_site/jekyll.html"