diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb
index cde539ef..8217d2fd 100644
--- a/lib/jekyll/static_file.rb
+++ b/lib/jekyll/static_file.rb
@@ -37,7 +37,7 @@ module Jekyll
     #
     # Returns destination file path.
     def destination(dest)
-      dest = site.in_dest_dir(dest)
+      dest = @site.in_dest_dir(dest)
       Jekyll.sanitized_path(dest, File.join(*[destination_rel_dir, @name].compact))
     end
 
diff --git a/test/test_cleaner.rb b/test/test_cleaner.rb
index e9bcc0f5..304ce623 100644
--- a/test/test_cleaner.rb
+++ b/test/test_cleaner.rb
@@ -4,15 +4,16 @@ class TestCleaner < Test::Unit::TestCase
   context "directory in keep_files" do
     setup do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
 
       FileUtils.mkdir_p(dest_dir('to_keep/child_dir'))
       FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html'))
       FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html'))
 
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(Jekyll.configuration({
+        "skip_config_files" => true,
+        "source" => source_dir,
+        "destination" => dest_dir
+      }))
       @site.keep_files = ['to_keep/child_dir']
 
       @cleaner = Site::Cleaner.new(@site)
@@ -43,14 +44,15 @@ class TestCleaner < Test::Unit::TestCase
   context "directory containing no files and non-empty directories" do
     setup do
       clear_dest
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
-      end
 
       FileUtils.mkdir_p(source_dir('no_files_inside/child_dir'))
       FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html'))
 
-      @site = Site.new(Jekyll.configuration)
+      @site = Site.new(Jekyll.configuration({
+        "skip_config_files" => true,
+        "source" => source_dir,
+        "destination" => dest_dir
+      }))
       @site.process
 
       @cleaner = Site::Cleaner.new(@site)