diff --git a/Gemfile b/Gemfile
index db17f0678..0c2a877d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -133,6 +133,7 @@ group :development, :test do
   # Spring speeds up development by keeping your application running in the background.
   # Read more: https://github.com/rails/spring
   gem 'spring', '~> 1.2.0'
+  gem 'spring-commands-rspec', '~> 1.0.2'
 
   # bundle exec rake doc:rails generates the API under doc/api.
   gem 'sdoc', '~> 0.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2af4db115..3175db835 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -310,6 +310,8 @@ GEM
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spring (1.2.0)
+    spring-commands-rspec (1.0.2)
+      spring (>= 0.9.1)
     sprockets (2.8.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -414,6 +416,7 @@ DEPENDENCIES
   simplecov (~> 0.9.1)
   simpleidn (~> 0.0.5)
   spring (~> 1.2.0)
+  spring-commands-rspec (~> 1.0.2)
   therubyracer
   traceroute (~> 0.4.0)
   turbolinks
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 338fa88d6..9ebf88da9 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -5,6 +5,7 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rspec/rails'
 require 'shoulda/matchers'
 require 'capybara/poltergeist'
+require 'paper_trail/frameworks/rspec'
 
 if ENV['ROBOT']
   require 'simplecov'