diff --git a/features/create_sites.feature b/features/create_sites.feature
index 5c6c7765..404257cb 100644
--- a/features/create_sites.feature
+++ b/features/create_sites.feature
@@ -5,13 +5,14 @@ Feature: Create sites
 
   Scenario: Basic site
     Given I have a blank site
-    And I have an index file that contains "Basic Site"
+    And I have an "index.html" file that contains "Basic Site"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Basic Site" in "index.html"
+    And I should see "Basic Site" in "_site/index.html"
 
   Scenario: Basic site with a post
     Given I have a blank site
+    And I have a _posts directory
     And I have a post titled "Hackers" for "3/24/2009" that contains "My First Exploit"
     When I run jekyll
     Then the _site directory should exist
@@ -21,7 +22,8 @@ Feature: Create sites
 
   Scenario: Basic site with layout
     Given I have a blank site
-    And I have an index file with a "default" layout that contains "Basic Site with Layout"
+    And I have a _layouts directory
+    And I have an "index.html" file with a "default" layout that contains "Basic Site with Layout"
     And I have a default layout that contains "{{ content }}"
     When I run jekyll
     Then the _site directory should exist
@@ -29,8 +31,10 @@ Feature: Create sites
 
   Scenario: Basic site with layout and a post
     Given I have a blank site
+    And I have a _layouts directory
+    And I have a _posts directory
     And I have a post titled "Hackers" for "3/24/2009" that contains "My First Exploit"
-    And I have an index file with a "default" layout that contains "Basic Site with Layout and a Post: {{ first_post }}"
+    And I have an "index.html" file with a "default" layout that contains "Basic Site with Layout and a Post: {{ first_post }}"
     And I have a default layout that contains "{{ content }}"
     When I run jekyll
     Then the _site directory should exist
@@ -40,3 +44,10 @@ Feature: Create sites
     And I should see "Basic Site with Layout and a Post: My First Exploit" in "_site/index.html"
 
   Scenario: Basic site with include tag
+    Given I have a blank site
+    And I have a _includes directory
+    And I have an "index.html" file that contains "Basic Site with include tag: {% include about.html %}"
+    And I have an "_includes/about.html" file that contains "Generated by Jekyll"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "Basic Site with include tag: Generated by Jekyll" in "_site/index.html"
diff --git a/features/site_configuration.feature b/features/site_configuration.feature
index 9351b3f9..d0656b37 100644
--- a/features/site_configuration.feature
+++ b/features/site_configuration.feature
@@ -4,6 +4,13 @@ Feature: Site configuration
   In order to make setting up a site easier
 
   Scenario: Change destination directory
+    Given I have a blank site
+    And I have an "index.html" file that contains "Changing destination directory"
+    And a configuration file with "site" set to "_mysite"
+    When I run jekyll
+    Then the _mysite directory should exist
+    And I should see "Basic Site" in "_mysite/index.html"
+
   Scenario: Use RDiscount for markup
   Scenario: Use Maruku for markup
   Scenario: Disable auto-regeneration