diff --git a/Gemfile b/Gemfile
index 69f13742..c703294d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,9 @@ end
 
 group :test do
   gem 'autotest'
+  gem 'ZenTest'
   gem 'growl-glue'
-  gem 'rspec-rails', '>= 2.0.0.beta.18'
+  gem 'rspec-rails', '2.3.1'
   gem 'factory_girl_rails'
   gem 'pickle'
   gem 'capybara'
diff --git a/Gemfile.lock b/Gemfile.lock
index e334acaa..9789074f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/floehopper/mocha.git
-  revision: 80f28aa72397c814e26a1893b576e768287b3c59
+  revision: 1ed96f77a967b497746176e0b8a46746f5b4d722
   specs:
     mocha (0.9.10.20101125155727)
       rake
@@ -70,7 +70,7 @@ GEM
       term-ansicolor (~> 1.0.4)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.12)
+    culerity (0.2.13)
     custom_fields (1.0.0.beta2)
       activesupport (>= 3.0.0)
       locomotive_carrierwave
@@ -254,6 +254,7 @@ PLATFORMS
 
 DEPENDENCIES
   RedCloth
+  ZenTest
   actionmailer-with-request
   autotest
   bson_ext (= 1.1.5)
@@ -284,7 +285,7 @@ DEPENDENCIES
   pickle
   rails (>= 3.0.0)
   rmagick (= 2.12.2)
-  rspec-rails (>= 2.0.0.beta.18)
+  rspec-rails (= 2.3.1)
   ruby-debug
   ruby-debug19
   rubyzip
diff --git a/doc/TODO b/doc/TODO
index 86b064a7..349a4523 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,6 +3,9 @@ BOARD:
 x jammit-s3: assets
 x copy assets.yml config file when using it as gem (http://asciicasts.com/episodes/218-making-generators-in-rails-3)
 x import theme without delayed_job
+x rspec 2.3
+- ruby 1.9.2:
+  - DelayedJob not working
 
 BACKLOG:
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1850220c..fd2d0b0c 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,15 +1,29 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
+# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+require File.expand_path("../../config/environment", __FILE__)
 require 'rspec/rails'
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/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|
+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"
+
+  # 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
 
   config.before(:each) do
     Locomotive.config.heroku = false
@@ -27,3 +41,35 @@ Rspec.configure do |config|
     end
   end
 end
+
+
+# # This file is copied to ~/spec when you run 'ruby script/generate rspec'
+# # from the project root directory.
+# ENV["RAILS_ENV"] ||= 'test'
+# require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
+# require 'rspec/rails'
+#
+# # Requires supporting files with custom matchers and macros, etc,
+# # in ./support/ and its subdirectories.
+# Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+#
+# Rspec.configure do |config|
+#   config.expect_with :rspec
+#   config.mock_with :mocha
+#
+#   config.before(:each) do
+#     Locomotive.config.heroku = false
+#   end
+#
+#   require 'database_cleaner'
+#   config.before(:suite) do
+#     DatabaseCleaner.strategy = :truncation
+#     DatabaseCleaner.orm = "mongoid"
+#   end
+#
+#   config.before(:each) do
+#     if self.described_class != Locomotive::Import::Job
+#       DatabaseCleaner.clean
+#     end
+#   end
+# end