diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index abaf6117bb8..40b091ded97 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -25,4 +25,31 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
     end
   end
+  context "loading config from external file" do
+    setup do
+      @paths = {
+        :default => File.join(Dir.pwd, '_config.yml'),
+        :other   => File.join(Dir.pwd, '_config.live.yml'),
+        :empty   => ""
+      }
+    end
+
+    should "load default config if no config_file is set" do
+      mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
+      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({})
+    end
+
+    should "load different config if specified" do
+      mock(YAML).safe_load_file(@paths[:other]) { {"baseurl" => "http://wahoo.dev"} }
+      mock($stdout).puts("Configuration file: #{@paths[:other]}")
+      assert_equal Jekyll::DEFAULTS.deep_merge({ "baseurl" => "http://wahoo.dev" }), Jekyll.configuration({ "config" => @paths[:other] })
+    end
+
+    should "load default config if path passed is empty" do
+      mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
+      mock($stdout).puts("Configuration file: #{@paths[:default]}")
+      assert_equal Jekyll::DEFAULTS, Jekyll.configuration({ "config" => @paths[:empty] })
+    end
+  end
 end