diff --git a/Gemfile b/Gemfile
index eb8b8bc0307..87687f85e23 100644
--- a/Gemfile
+++ b/Gemfile
@@ -137,6 +137,7 @@ group :test, :development do
   gem 'timecop'
   gem 'rspec-given'
   gem 'rspec-html-matchers'
+  gem 'spork-rails'
   gem 'pry-nav'
   gem 'byebug', require: ENV['RM_INFO'].nil?
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 3151083c979..d3218d676b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -396,6 +396,10 @@ GEM
       tilt (>= 1.3, < 3)
     slop (3.6.0)
     sorcerer (1.0.2)
+    spork (1.0.0rc4)
+    spork-rails (4.0.0)
+      rails (>= 3.0.0, < 5)
+      spork (>= 1.0rc0)
     sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -522,6 +526,7 @@ DEPENDENCIES
   simple-rss
   simplecov
   sinatra
+  spork-rails
   stackprof
   therubyracer
   thin