diff --git a/Gemfile b/Gemfile
index 7dd255b818c..730ce897e81 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,8 +69,6 @@ group :test do
   gem "cucumber-rails-training-wheels" # http://aslakhellesoy.com/post/11055981222/the-training-wheels-came-off
   gem "rspec-rails", "~> 2.0", :group => :development
   gem 'capybara'
-  gem 'spork-rails'
-  gem 'spork-testunit' # needed for test-unit only
   gem 'selenium-webdriver'
 
   gem 'rb-readline' # ruby on CI needs this
@@ -89,7 +87,6 @@ group :development do
   gem 'rails-dev-tweaks', '~> 0.6.1'
   gem 'guard-rspec'
   gem 'guard-cucumber'
-  gem 'guard-spork'
   gem 'rb-fsevent', :group => :test
   gem 'rack-mini-profiler'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index c75f849ab78..65d8bc52d5b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -160,13 +160,9 @@ GEM
     guard-cucumber (1.4.0)
       cucumber (>= 1.2.0)
       guard (>= 1.1.0)
-    guard-rspec (2.6.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    guard-spork (1.5.0)
-      childprocess (>= 0.2.3)
+    guard-rspec (2.5.4)
       guard (>= 1.1)
-      spork (>= 0.8.4)
+      rspec (~> 2.11)
     guard-test (0.8.0)
       guard (>= 1.1)
       test-unit (~> 2.2)
@@ -203,7 +199,7 @@ GEM
     mime-types (1.23)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.7.3)
+    multi_json (1.7.2)
     mysql (2.9.1)
     mysql2 (0.3.11)
     nokogiri (1.5.9)
@@ -249,8 +245,8 @@ GEM
       railties (~> 3.1)
     rails-footnotes (3.7.9)
       rails (>= 3.0.0)
-    rails_autolink (1.1.0)
-      rails (> 3.1)
+    rails_autolink (1.0.9)
+      rails (~> 3.1)
     rake (10.0.4)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
@@ -301,12 +297,6 @@ GEM
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
     slop (3.4.4)
-    spork (1.0.0rc3)
-    spork-rails (3.2.1)
-      rails (>= 3.0.0, < 3.3.0)
-      spork (>= 1.0rc0)
-    spork-testunit (0.0.8)
-      spork (>= 0.6.0)
     sqlite3 (1.3.7)
     sqlite3-ruby (1.2.5)
     strong_parameters (0.2.0)
@@ -319,8 +309,8 @@ GEM
       libv8 (~> 3.11.8.12)
       ref
     thor (0.18.1)
-    tilt (1.4.0)
-    tinymce-rails (3.5.8.2)
+    tilt (1.3.7)
+    tinymce-rails (3.5.8.1)
       railties (>= 3.1.1)
     tinymce-rails-langs (0.1)
       tinymce-rails (>= 3.4.9)
@@ -360,7 +350,6 @@ DEPENDENCIES
   globalize3!
   guard-cucumber
   guard-rspec
-  guard-spork
   guard-test
   htmldiff
   i18n-js!
@@ -398,8 +387,6 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   selenium-webdriver
   shoulda (~> 3.1.1)
-  spork-rails
-  spork-testunit
   sprockets!
   sqlite3
   sqlite3-ruby (< 1.3)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 3e75827ce8c..e900e7b09e1 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,69 +28,64 @@
 # free to delete them.
 
 require 'rubygems'
-require 'spork'
 
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 
-Spork.prefork do
-  # Loading more in this block will cause your tests to run faster. However,
-  # if you change any configuration or code from libraries loaded here, you'll
-  # need to restart spork for it take effect.
+# Loading more in this block will cause your tests to run faster. However,
+# if you change any configuration or code from libraries loaded here, you'll
+# need to restart spork for it take effect.
 
-  # This file is copied to spec/ when you run 'rails generate rspec:install'
-  ENV["RAILS_ENV"] ||= 'test'
-  require File.expand_path("../../config/environment", __FILE__)
-  require 'rspec/rails'
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
 
-  require 'rspec/autorun'
-  require 'capybara/rails'
+require 'rspec/autorun'
+require 'capybara/rails'
 
-  # Requires supporting ruby files with custom matchers and macros, etc,
-  # in spec/support/ and its subdirectories.
-  Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
 
-  RSpec.configure do |config|
-    # ## Mock Framework
-    #
-    # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-    #
-    # config.mock_with :mocha
-    # config.mock_with :flexmock
-    # config.mock_with :rr
-    config.mock_with :rspec
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
 
-    # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-    config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
 
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, remove the following line or assign false
-    # instead of true.
-    config.use_transactional_fixtures = true
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
 
-    # If true, the base class of anonymous controllers will be inferred
-    # automatically. This will be the default behavior in future versions of
-    # rspec-rails.
-    config.infer_base_class_for_anonymous_controllers = false
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
 
-    # Run specs in random order to surface order dependencies. If you find an
-    # order dependency and want to debug it, you can fix the order by providing
-    # the seed, which is printed after each run.
-    #     --seed 1234
-    config.order = "random"
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
 
-    config.treat_symbols_as_metadata_keys_with_true_values = true
-    config.run_all_when_everything_filtered = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
 
-    config.after(:suite) do
-      [User, Project, Issue].each do |cls|
-        raise "your specs leave a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
+  config.after(:suite) do
+    [User, Project, Issue].each do |cls|
+      raise "your specs leave a #{cls} in the DB\ndid you use before(:all) instead of before or forget to kill the instances in a after(:all)?" if cls.count > 0
     end
   end
-  end
 end
 
-Spork.each_run do
-  # This code will be run each time you run your specs.
-  FactoryGirl.reload
-end
+# This code will be run each time you run your specs.
+FactoryGirl.reload