diff --git a/Rakefile b/Rakefile
index d703d3f..b5b2ce5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,23 +1,39 @@
+# encoding: UTF-8
+require 'rubygems'
+
+require 'bundler'
 require 'bundler/setup'
+require 'bundler/gem_tasks'
 
+require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
+require 'coveralls/rake/task'
+
+require 'yard'
+
+begin
+  Bundler.setup(:default, :development, :test)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts 'Run `bundle install` to install missing gems'
+  exit e.status_code
+end
+
 RSpec::Core::RakeTask.new(:examples) do |examples|
   examples.rspec_opts = '-Ispec'
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
+RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.rspec_opts = '-Ispec'
   spec.rcov = true
 end
 
-require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features)
 
-require 'coveralls/rake/task'
 Coveralls::RakeTask.new
-task :test_with_coveralls => [:spec, :features, 'coveralls:push']
-
-task :default => :test_with_coveralls
 
-require 'yard'
 YARD::Rake::YardocTask.new
+
+task test_with_coveralls: [:features, 'coveralls:push']
+
+task default: :test_with_coveralls