diff --git a/script/test b/script/test
index 13cf745d..551a7c4c 100755
--- a/script/test
+++ b/script/test
@@ -5,10 +5,6 @@ set -e
 #   script/test
 #   script/test <test_file>
 
-if [ ! -d tmp ]
-  then mkdir tmp
-fi
-
 if [ -d test/dest ]
   then rm -r test/dest
 fi
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 0460f3f6..945cc2da 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -4,6 +4,10 @@ require 'helper'
 
 class TestTags < JekyllUnitTest
 
+  def setup
+    FileUtils.mkdir_p("tmp")
+  end
+
   def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     site = fixture_site({"highlighter" => "rouge"}.merge(override))