diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index 8a27e161..b3ee35e1 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -35,7 +35,7 @@ module Jekyll
     'server'       => false,
     'server_port'  => 4000,
 
-    'source'       => '.',
+    'source'       => Dir.pwd,
     'destination'  => File.join('.', '_site'),
 
     'lsi'          => false,
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 3b05ed51..3d4554a3 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/helper'
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
     setup do
-      @path = './_config.yml'
+      @path = File.join(Dir.pwd, '_config.yml')
     end
 
     should "fire warning with no _config.yml" do