diff --git a/Gemfile b/Gemfile
index 4ca0668f..87bb3a36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,15 +2,13 @@ source "http://rubygems.org"
 
 gem "yard"
 gem "rake"
-gem "cucumber", ">=0.8"
+gem "cucumber", "~>0.8.5"
 gem "rspec"
 
 group :test do
+  gem "aruba"
   gem "rspec-rails"
-  gem "rails", "~>2.3"
-  gem "datamapper"
-  gem "mongoid"
-  gem "cucumber-rails", ">=0.3.2"
+  gem "cucumber-rails", "~>0.3.2"
   gem "factory_girl"
   gem "machinist"
   gem "jeweler"
@@ -20,4 +18,9 @@ group :test do
   gem "webrat"
   gem "sqlite3-ruby"
   gem "ruby-debug"
+  gem "actionmailer", "~>2.3.8"
+  gem "activerecord", "~>2.3.8"
+  gem "datamapper"
+  gem "mongoid"
+  gem "bson_ext"
 end
\ No newline at end of file
diff --git a/Gemfile.lock b/Gemfile.lock
index 4d3630f4..00affdda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,11 +8,11 @@ GEM
       rack (~> 1.1.0)
     activerecord (2.3.8)
       activesupport (= 2.3.8)
-    activeresource (2.3.8)
-      activesupport (= 2.3.8)
     activesupport (2.3.8)
     addressable (2.2.0)
+    aruba (0.2.1)
     bson (1.0.4)
+    bson_ext (1.0.4)
     builder (2.1.2)
     capybara (0.3.9)
       culerity (>= 0.2.4)
@@ -100,13 +100,6 @@ GEM
     rack (1.1.0)
     rack-test (0.5.4)
       rack (>= 1.0)
-    rails (2.3.8)
-      actionmailer (= 2.3.8)
-      actionpack (= 2.3.8)
-      activerecord (= 2.3.8)
-      activeresource (= 2.3.8)
-      activesupport (= 2.3.8)
-      rake (>= 0.8.3)
     rake (0.8.7)
     rcov (0.9.8)
     rspec (1.3.0)
@@ -141,16 +134,19 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  actionmailer (~> 2.3.8)
+  activerecord (~> 2.3.8)
+  aruba
+  bson_ext
   capybara
-  cucumber (>= 0.8)
-  cucumber-rails (>= 0.3.2)
+  cucumber (~> 0.8.5)
+  cucumber-rails (~> 0.3.2)
   database_cleaner
   datamapper
   factory_girl
   jeweler
   machinist
   mongoid
-  rails (~> 2.3)
   rake
   rcov
   rspec