diff --git a/Gemfile b/Gemfile
index 67b5f443d..d9e7cb6da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,7 +70,7 @@ gem 'cloudfiles', '1.4.10', :require => false
 
 #Queue
 gem 'resque', '1.10.0'
-gem 'SystemTimer', '1.2.1' unless RUBY_VERSION.include? '1.9' || RUBY_PLATFORM =~ 'win32'
+gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
 
 group :development do
   gem 'yard'
@@ -82,11 +82,9 @@ end
 group :test, :development do
   gem 'factory_girl_rails', :require => false
   gem 'ruby-debug-base19', '0.11.23' if RUBY_VERSION.include? '1.9.1'
-  gem 'ruby-debug19' if RUBY_VERSION.include? '1.9'
-  if defined?(Rubinius).nil? && RUBY_VERSION.include?('1.8')
-    gem 'ruby-debug'
-    gem 'linecache', '0.43'
-  end
+  gem 'ruby-debug19', :platforms => :ruby_19
+  gem 'ruby-debug', :platforms => :mri_18
+  gem 'linecache', '0.43', :platforms => :mri_18
   gem 'launchy'
   gem 'jasmine', '1.0.2.1'
 end
@@ -103,7 +101,7 @@ group :test do
   gem 'rcov', :require => false
   gem 'database_cleaner', '0.6.0'
   gem 'webmock', :require => false
-  gem 'mongrel', :require => false if RUBY_VERSION.include? '1.8'
+  gem 'mongrel', :require => false, :platforms => :ruby_18
   gem 'rspec-instafail', '>= 0.1.7', :require => false
   gem 'fuubar'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 8c645b8e6..a27d42e60 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,6 +99,7 @@ GEM
       activesupport (= 3.0.3)
     activesupport (3.0.3)
     addressable (2.2.4)
+    archive-tar-minitar (0.5.2)
     arel (2.0.10)
     aws (2.3.32)
       activesupport
@@ -231,6 +232,8 @@ GEM
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     linecache (0.43)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
@@ -369,11 +372,21 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
     ruby-hmac (0.4.0)
     ruby-openid (2.1.8)
     ruby-openid-apps-discovery (1.2.0)
       ruby-openid (>= 2.1.7)
     ruby-progressbar (0.0.10)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     rubyntlm (0.1.1)
     rubyzip (0.9.4)
     selenium-webdriver (0.2.2)
@@ -480,6 +493,7 @@ DEPENDENCIES
   rspec-instafail (>= 0.1.7)
   rspec-rails (>= 2.0.0)
   ruby-debug
+  ruby-debug19
   selenium-webdriver (= 0.2.2)
   settingslogic (= 2.0.6)
   sod!
diff --git a/features/step_definitions/oauth_steps.rb b/features/step_definitions/oauth_steps.rb
index a0793eb31..b40c3a0b8 100644
--- a/features/step_definitions/oauth_steps.rb
+++ b/features/step_definitions/oauth_steps.rb
@@ -59,6 +59,7 @@ class Chubbies
 
   def self.run
     @pid = fork do
+      ensure_bundled
       Process.exec "cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle exec rackup -p #{PORT} 2> /dev/null 1> /dev/null"
     end
 
@@ -75,6 +76,13 @@ class Chubbies
     `kill -9 #{get_pid}`
   end
 
+  def self.ensure_bundled
+    if !(@bundled)
+      `cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle 2> /dev/null 1> /dev/null`
+      @bundled = true
+    end
+  end
+
   def self.ensure_killed
     if !(@killed) && self.running?
       self.kill
diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile
index 44d50dee8..97b6e4d57 100644
--- a/spec/chubbies/Gemfile
+++ b/spec/chubbies/Gemfile
@@ -1,10 +1,7 @@
-source :rubygems
-
 gem 'sinatra'
 gem 'haml'
 
 gem 'json'
-gem 'shotgun'
 gem 'sqlite3'
 gem 'activerecord', '3.0.3'
 gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
index eeafa166e..20f55b348 100644
--- a/spec/chubbies/Gemfile.lock
+++ b/spec/chubbies/Gemfile.lock
@@ -17,7 +17,6 @@ GIT
       json (>= 1.2.4)
 
 GEM
-  remote: http://rubygems.org/
   specs:
     activemodel (3.0.3)
       activesupport (= 3.0.3)
@@ -45,8 +44,6 @@ GEM
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
     rack (1.3.0)
-    shotgun (0.9)
-      rack (>= 1.0)
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
@@ -63,6 +60,5 @@ DEPENDENCIES
   haml
   json
   jwt!
-  shotgun
   sinatra
   sqlite3