diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index c07a3c73..f5974d0b 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -116,6 +116,34 @@ Feature: Site configuration
     And I should see "Post Layout: <p>content for entry1.</p>" in "_site/2007/12/31/entry1.html"
     And I should see "Post Layout: <p>content for entry2.</p>" in "_site/2020/01/31/entry2.html"
 
+    Scenario: Generate proper dates with explicitly set timezone
+      Given I have a _layouts directory
+      And I have a page layout that contains "Page Layout: {{ site.posts.size }} on {{ site.time | date: \"%Y-%m-%d\" }}"
+      And I have a post layout that contains "Post Layout: {{ content }} built at {{ page.date | date_to_xmlschema }}"
+      And I have an "index.html" page with layout "page" that contains "site index page"
+      And I have a configuration file with:
+        | key         | value            |
+        | time        | 2013-04-10       |
+        | timezone    | America/New_York |
+      And I have a _posts directory
+      And I have the following posts:
+        | title     | date                     | layout  | content             |
+        | entry1    | "2013-04-09 23:22 -0400" | post    | content for entry1. |
+        | entry2    | "2013-04-10 03:14 -0400" | post    | content for entry2. |
+      When I run jekyll
+      Then the _site directory should exist
+      And I should see "Page Layout: 2 on 2013-04-10" in "_site/index.html"
+      And I should see "Post Layout: <p>content for entry1.</p> built at 2013-04-09T23:22:00-04:00" in "_site/2013/04/09/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p> built at 2013-04-10T03:14:00-04:00" in "_site/2013/04/10/entry2.html"
+      And I have a configuration file with:
+        | key         | value               |
+        | timezone    | Australia/Melbourne |
+      When I run jekyll
+      Then the _site directory should exist
+      And I should see "Page Layout: 2 on 2013-04-10" in "_site/index.html"
+      And I should see "Post Layout: <p>content for entry1.</p> built at 2013-04-10T13:14:00+10:00" in "_site/2013/04/10/entry1.html"
+      And I should see "Post Layout: <p>content for entry2.</p> built at 2013-04-10T17:14:00+10:00" in "_site/2013/04/10/entry2.html"
+
   Scenario: Limit the number of posts generated by most recent date
     Given I have a _posts directory
     And I have a configuration file with: