diff --git a/Gemfile b/Gemfile
index bb9bc514..9a3c3e75 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,18 +3,23 @@ source "http://rubygems.org"
 gemspec
 
 gem "rails", "~> 3.0.0"
-gem "webrat", "0.7.2"
-gem "mocha", :require => false
 gem "oa-oauth", :require => "omniauth/oauth"
 gem "oa-openid", :require => "omniauth/openid"
 
+group :test do
+  gem "webrat", "0.7.2", :require => false
+  gem "mocha", :require => false
+end
+
 platforms :jruby do
   gem 'activerecord-jdbcsqlite3-adapter'
 end
 
 platforms :ruby do
-  gem "sqlite3-ruby"
-  gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+  group :test do
+    gem "sqlite3-ruby"
+    gem "ruby-debug", ">= 0.10.3" if RUBY_VERSION < '1.9'
+  end
 
   group :mongoid do
     gem "mongo", "1.1.2"
diff --git a/test/rails_app/config/boot.rb b/test/rails_app/config/boot.rb
index 6d0928a9..ea1f6717 100644
--- a/test/rails_app/config/boot.rb
+++ b/test/rails_app/config/boot.rb
@@ -7,7 +7,7 @@ begin
 rescue LoadError
   require 'rubygems'
   require 'bundler'
-  Bundler.setup :default, DEVISE_ORM
+  Bundler.setup :default, :test, DEVISE_ORM
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
\ No newline at end of file
+$:.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 4b1d339b..7e7fca45 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -9,8 +9,9 @@ require "rails/test_help"
 require "orm/#{DEVISE_ORM}"
 
 I18n.load_path << File.expand_path("../support/locale/en.yml", __FILE__)
-require 'mocha'
 
+require 'mocha'
+require 'webrat'
 Webrat.configure do |config|
   config.mode = :rails
   config.open_error_files = false
@@ -20,4 +21,4 @@ Devise::OmniAuth.test_mode!
 
 # Add support to load paths so we can overwrite broken webrat setup
 $:.unshift File.expand_path('../support', __FILE__)
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
\ No newline at end of file
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }