diff --git a/Gemfile b/Gemfile
index b99426c399..0cb509c5c7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -53,7 +53,6 @@ group :test, :development do
   gem 'capybara'
   gem 'database_cleaner', '0.7.1', :require => false
   gem 'simplecov', :require => false
-  gem 'spork', '~> 1.0rc'
   gem 'awesome_print'
   gem "letter_opener"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 301487e9b8..8d0a1f0eb3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,6 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.3.3)
-    spork (1.0.0rc3)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -403,7 +402,6 @@ DEPENDENCIES
   shoulda-matchers
   simple_form!
   simplecov
-  spork (~> 1.0rc)
   spree!
   spree_auth_devise!
   spree_heroku!
diff --git a/README.markdown b/README.markdown
index 834f763654..27c303df51 100644
--- a/README.markdown
+++ b/README.markdown
@@ -59,15 +59,9 @@ Then the tests can be run with:
     bundle exec rspec spec
 
 The site is configured to use
-[Spork](https://github.com/sporkrb/spork) to reduce the pre-test
-startup time while Rails loads. To use it, first start up a spork
-instance:
-
-    bundle exec spork
-
-When that's ready, you can run RSpec with the --drb flag:
-
-    bundle exec rspec --drb spec
+[Zeus](https://github.com/burke/zeus) to reduce the pre-test
+startup time while Rails loads. See the Zeus github page for
+usage instructions.
 
 
 ## Deployment
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8c139c28bf..40a1500133 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -2,84 +2,70 @@ require 'simplecov'
 SimpleCov.start
 
 require 'rubygems'
-require 'spork'
-#uncomment the following line to use spork with the debugger
-#require 'spork/ext/ruby-debug'
 
 
-Spork.prefork do
-  ENV["RAILS_ENV"] ||= 'test'
-  require File.expand_path("../../config/environment", __FILE__)
-  require 'rspec/rails'
-  require 'rspec/autorun'
-  require 'capybara'
-  require 'database_cleaner'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+require 'capybara'
+require 'database_cleaner'
 
-  # 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}
-  require 'spree/core/testing_support/controller_requests'
+# 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}
+require 'spree/core/testing_support/controller_requests'
 
-  require 'active_record/fixtures'
-  fixtures_dir = File.expand_path('../../db/default', __FILE__)
-  ActiveRecord::Fixtures.create_fixtures(fixtures_dir, ['spree/states', 'spree/countries'])
+require 'active_record/fixtures'
+fixtures_dir = File.expand_path('../../db/default', __FILE__)
+ActiveRecord::Fixtures.create_fixtures(fixtures_dir, ['spree/states', 'spree/countries'])
 
 
-  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
+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
 
-    # 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 = false
+  # 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 = 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
+  # 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
 
-    # ## Filters
-    #
-    config.filter_run_excluding :skip => true
+  # ## Filters
+  #
+  config.filter_run_excluding :skip => true
 
-    config.before(:each) do
-      if example.metadata[:js]
-        DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
-      else
-        DatabaseCleaner.strategy = :transaction
-      end
-      DatabaseCleaner.start
+  config.before(:each) do
+    if example.metadata[:js]
+      DatabaseCleaner.strategy = :truncation, { :except => ['spree_countries', 'spree_states'] }
+    else
+      DatabaseCleaner.strategy = :transaction
     end
-
-    config.after(:each) do
-      DatabaseCleaner.clean
-    end
-
-    config.include Rails.application.routes.url_helpers
-    config.include Spree::UrlHelpers
-    config.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
-    config.include Devise::TestHelpers, :type => :controller
+    DatabaseCleaner.start
   end
-end
 
-Spork.each_run do
-  Dir["#{File.dirname(__FILE__)}/../app/**/*.rb"].each {|f| load f}
-  Dir["#{File.dirname(__FILE__)}/../lib/**/*.rb"].each {|f| load f}
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
 
-  Rails.application.reload_routes!
+  config.include Rails.application.routes.url_helpers
+  config.include Spree::UrlHelpers
+  config.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
+  config.include Devise::TestHelpers, :type => :controller
 
+  # Factory girl
   require 'factory_girl_rails'
-
-  RSpec.configure do |config|
-    config.include FactoryGirl::Syntax::Methods
-  end
+  config.include FactoryGirl::Syntax::Methods
 end