diff --git a/test/test_layout_reader.rb b/test/test_layout_reader.rb
new file mode 100644
index 00000000..eead655a
--- /dev/null
+++ b/test/test_layout_reader.rb
@@ -0,0 +1,17 @@
+require 'helper'
+
+class TestLayoutReader < Test::Unit::TestCase
+  context "reading layouts" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "read layouts" do
+      layouts = LayoutReader.new(@site).read
+      assert_equal ["default", "simple", "post/simple"].sort, layouts.keys.sort
+    end
+  end
+end
diff --git a/test/test_site.rb b/test/test_site.rb
index 5e639f50..b1cf01d1 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -161,11 +161,6 @@ class TestSite < Test::Unit::TestCase
       assert_equal sorted_pages, @site.pages.map(&:name)
     end
 
-    should "read layouts" do
-      @site.read_layouts
-      assert_equal ["default", "simple", "post/simple"].sort, @site.layouts.keys.sort
-    end
-
     should "read posts" do
       @site.read_posts('')
       posts = Dir[source_dir('_posts', '**', '*')]