diff --git a/.rspec b/.rspec
new file mode 100644
index 00000000..a5faa1d6
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--color
+--backtrace
diff --git a/Gemfile b/Gemfile
index 8cce8735..12e20c8f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 source 'https://rubygems.org'
 
 gemspec
@@ -9,14 +7,17 @@ gem 'veritas', :git => 'https://github.com/dkubb/veritas'
 
 group :development do
   gem 'rake',    '~> 0.9.2'
-  gem 'rspec',   '~> 1.3.2'
   gem 'yard',    '~> 0.8.1'
+  gem 'rspec',   '~> 2'
+  # Remove this once https://github.com/nex3/rb-inotify/pull/20 is solved.
+  # This patch makes rb-inotify a nice player with listen so it does not poll.
+  gem 'rb-inotify', :git => 'https://github.com/mbj/rb-inotify'
 end
 
 group :guard do
-  gem 'guard',         '~> 1.1.1'
-  gem 'guard-bundler', '~> 0.1.3'
-  gem 'guard-rspec',   '~> 0.7.3'
+  gem 'guard',         '~> 1.2.3'
+  gem 'guard-bundler', '~> 1.0.0'
+  gem 'guard-rspec',   '~> 1.2.0'
 end
 
 group :metrics do
@@ -26,20 +27,5 @@ group :metrics do
   gem 'roodi',           '~> 2.1.0'
   gem 'yardstick',       '~> 0.5.0'
   gem 'yard-spellcheck', '~> 0.1.5'
-
-  platforms :mri_18 do
-    gem 'arrayfields', '~> 4.7.4'  # for metric_fu
-    gem 'fattr',       '~> 2.2.0'  # for metric_fu
-    gem 'heckle',      '~> 1.4.3'
-    gem 'json',        '~> 1.7.3'  # for metric_fu rake task
-    gem 'map',         '~> 6.0.1'  # for metric_fu
-    gem 'metric_fu',   '~> 2.1.1'
-    gem 'mspec',       '~> 1.5.17'
-    gem 'rcov',        '~> 1.0.0'
-    gem 'ruby2ruby',   '= 1.2.2'
-  end
-
-  platforms :rbx do
-    gem 'pelusa', '~> 0.2.1'
-  end
+  gem 'pelusa',          '~> 0.2.1'
 end
diff --git a/Guardfile b/Guardfile
index fa1eb9c3..fc228bb6 100644
--- a/Guardfile
+++ b/Guardfile
@@ -4,7 +4,7 @@ guard :bundler do
   watch('Gemfile')
 end
 
-guard :rspec do
+guard :rspec, :version => 2, :all_on_start => false do
   # run all specs if the spec_helper or supporting files files are modified
   watch('spec/spec_helper.rb')                      { 'spec' }
   watch(%r{\Aspec/(?:lib|support|shared)/.+\.rb\z}) { 'spec' }
diff --git a/spec/spec.opts b/spec/spec.opts
index 80d5b322..e69de29b 100644
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,3 +0,0 @@
---color
---loadby random
---format profile
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bb13e121..9edbaaa6 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,12 +1,11 @@
 # encoding: utf-8
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 # require spec support files and shared behavior
 Dir[File.expand_path('../{support,shared}/**/*.rb', __FILE__)].each { |f| require f }
 
 require 'mutant'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end