diff --git a/features/step_definitions/jekyll_steps.rb b/features/step_definitions/jekyll_steps.rb
index 8ff7500e..db93010e 100644
--- a/features/step_definitions/jekyll_steps.rb
+++ b/features/step_definitions/jekyll_steps.rb
@@ -18,19 +18,19 @@ end
 
 
 Before do
-  FileUtils.mkdir(TEST_DIR)
+  FileUtils.mkdir_p(TEST_DIR) unless File.exists?(TEST_DIR)
   Dir.chdir(TEST_DIR)
 end
 
 After do
-  FileUtils.rm_rf(TEST_DIR)
-  FileUtils.rm_rf(JEKYLL_COMMAND_OUTPUT_FILE)
+  FileUtils.rm_rf(TEST_DIR)   if File.exists?(TEST_DIR)
+  FileUtils.rm(JEKYLL_COMMAND_OUTPUT_FILE)
 end
 
 World(Test::Unit::Assertions)
 
 Given /^I have a blank site in "(.*)"$/ do |path|
-  FileUtils.mkdir_p(path)
+  FileUtils.mkdir_p(path) unless File.exists?(path)
 end
 
 Given /^I do not have a "(.*)" directory$/ do |path|
diff --git a/features/support/env.rb b/features/support/env.rb
index 07ae1f76..ad3bb38a 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -6,9 +6,9 @@ require 'rr'
 require 'test/unit'
 require 'time'
 
-TEST_DIR    = File.join('/', 'tmp', 'jekyll')
+TEST_DIR    = File.expand_path(File.join('..', '..', 'tmp', 'jekyll'), File.dirname(__FILE__))
 JEKYLL_PATH = File.join(File.dirname(__FILE__), '..', '..', 'bin', 'jekyll')
-JEKYLL_COMMAND_OUTPUT_FILE = File.join('/', 'tmp', 'jekyll_output.txt')
+JEKYLL_COMMAND_OUTPUT_FILE = File.join(File.dirname(TEST_DIR), 'jekyll_output.txt')
 
 def jekyll_output_file
   JEKYLL_COMMAND_OUTPUT_FILE
diff --git a/jekyll.gemspec b/jekyll.gemspec
index 473418fd..d22479f4 100644
--- a/jekyll.gemspec
+++ b/jekyll.gemspec
@@ -46,7 +46,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('redgreen', "~> 1.2")
   s.add_development_dependency('shoulda', "~> 3.5")
   s.add_development_dependency('rr', "~> 1.1")
-  s.add_development_dependency('cucumber', "~> 1.3")
+  s.add_development_dependency('cucumber', "1.3.11")
   s.add_development_dependency('RedCloth', "~> 4.2")
   s.add_development_dependency('kramdown', "~> 1.3")
   s.add_development_dependency('rdiscount', "~> 1.6")