diff --git a/test/test_draft.rb b/test/test_draft.rb
index b1b3d08d..5843665b 100644
--- a/test/test_draft.rb
+++ b/test/test_draft.rb
@@ -8,8 +8,7 @@ class TestDraft < Test::Unit::TestCase
   context "A Draft" do
     setup do
       clear_dest
-      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(site_configuration)
     end
 
     should "ensure valid drafts are valid" do
diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb
index e562277e..5c5711cb 100644
--- a/test/test_entry_filter.rb
+++ b/test/test_entry_filter.rb
@@ -3,10 +3,7 @@ require 'helper'
 class TestEntryFilter < Test::Unit::TestCase
   context "Filtering entries" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(site_configuration)
     end
 
     should "filter entries" do
@@ -50,10 +47,7 @@ class TestEntryFilter < Test::Unit::TestCase
     end
 
     should "filter symlink entries when safe mode enabled" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
-      end
-      site = Site.new(Jekyll.configuration)
+      site = Site.new(site_configuration('safe' => true))
       stub(File).symlink?('symlink.js') {true}
       files = %w[symlink.js]
       assert_equal [], site.filter_entries(files)
@@ -66,10 +60,7 @@ class TestEntryFilter < Test::Unit::TestCase
     end
 
     should "not include symlinks in safe mode" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
-      end
-      site = Site.new(Jekyll.configuration)
+      site = Site.new(site_configuration('safe' => true))
 
       site.read_directories("symlink-test")
       assert_equal [], site.pages
@@ -77,10 +68,7 @@ class TestEntryFilter < Test::Unit::TestCase
     end
 
     should "include symlinks in unsafe mode" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
-      end
-      site = Site.new(Jekyll.configuration)
+      site = Site.new(site_configuration)
 
       site.read_directories("symlink-test")
       assert_not_equal [], site.pages
@@ -90,10 +78,7 @@ class TestEntryFilter < Test::Unit::TestCase
 
   context "#glob_include?" do
     setup do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(site_configuration)
       @filter = EntryFilter.new(@site)
     end
 
diff --git a/test/test_excerpt.rb b/test/test_excerpt.rb
index b6300fde..200a46be 100644
--- a/test/test_excerpt.rb
+++ b/test/test_excerpt.rb
@@ -13,10 +13,7 @@ class TestExcerpt < Test::Unit::TestCase
   context "With extraction disabled" do
     setup do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'excerpt_separator' => ''})
-      end
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(site_configuration('excerpt_separator' => ''))
       @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
     end
 
@@ -29,8 +26,7 @@ class TestExcerpt < Test::Unit::TestCase
   context "An extracted excerpt" do
     setup do
       clear_dest
-      stub(Jekyll).configuration { Jekyll::Configuration::DEFAULTS }
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(site_configuration)
       @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
       @excerpt = @post.send :extract_excerpt
     end
diff --git a/test/test_post.rb b/test/test_post.rb
index 206060d8..582d100a 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -688,7 +688,7 @@ class TestPost < Test::Unit::TestCase
 
   context "site config with category" do
     setup do
-      config = Jekyll::Configuration::DEFAULTS.merge({
+      config = site_configuration({
         'defaults' => [
           'scope' => {
             'path' => ''
@@ -715,7 +715,7 @@ class TestPost < Test::Unit::TestCase
 
   context "site config with categories" do
     setup do
-      config = Jekyll::Configuration::DEFAULTS.merge({
+      config = site_configuration({
         'defaults' => [
           'scope' => {
             'path' => ''