diff --git a/gem_rake_helper.rb b/gem_rake_helper.rb
index 6353f05b..f9585479 100644
--- a/gem_rake_helper.rb
+++ b/gem_rake_helper.rb
@@ -1,6 +1,5 @@
 require 'rubygems' unless defined?(Gem)
 require 'rake'
-require 'cucumber/rake/task'
 require 'yard'
 
 require 'bundler'
@@ -16,7 +15,9 @@ class Bundler::GemHelper
   end
 end
 
-Cucumber::Rake::Task.new(:test, 'Run features that should pass') do |t|
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new do |t|
   exempt_tags = ["--tags ~@wip"]
   exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
   exempt_tags << "--tags ~@encoding" unless Object.const_defined?(:Encoding)
@@ -25,6 +26,24 @@ Cucumber::Rake::Task.new(:test, 'Run features that should pass') do |t|
   t.cucumber_opts = "--color #{exempt_tags.join(" ")} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
 end
 
+Cucumber::Rake::Task.new(:cucumber_wip) do |t|
+  exempt_tags = ["--tags @wip"]
+  exempt_tags << "--tags ~@nojava" if RUBY_PLATFORM == "java"
+  exempt_tags << "--tags ~@encoding" unless Object.const_defined?(:Encoding)
+
+  t.cucumber_opts = "--color #{exempt_tags.join(" ")} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'Fivemat'}"
+end
+
+require 'rspec/core/rake_task'
+desc "Run RSpec"
+RSpec::Core::RakeTask.new do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--color', '--format nested']
+end
+
+desc "Run tests, both RSpec and Cucumber"
+task :test => [:spec, :cucumber]
+
 YARD::Rake::YardocTask.new
 
 task :default => :test
diff --git a/middleman-core/spec/middleman-core/sitemap_spec.rb b/middleman-core/spec/middleman-core/sitemap_spec.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-core/spec/spec_helper.rb b/middleman-core/spec/spec_helper.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/spec/middleman-more/future_spec.rb b/middleman-more/spec/middleman-more/future_spec.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman-more/spec/spec_helper.rb b/middleman-more/spec/spec_helper.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman/spec/middleman/future_spec.rb b/middleman/spec/middleman/future_spec.rb
new file mode 100644
index 00000000..e69de29b
diff --git a/middleman/spec/spec_helper.rb b/middleman/spec/spec_helper.rb
new file mode 100644
index 00000000..e69de29b