diff --git a/Gemfile b/Gemfile
index d9e7cb6da..648753036 100644
--- a/Gemfile
+++ b/Gemfile
@@ -102,6 +102,7 @@ group :test do
   gem 'database_cleaner', '0.6.0'
   gem 'webmock', :require => false
   gem 'mongrel', :require => false, :platforms => :ruby_18
+  gem 'sqlite3', :require => false
   gem 'rspec-instafail', '>= 0.1.7', :require => false
   gem 'fuubar'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index a27d42e60..d415392ea 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -399,6 +399,7 @@ GEM
     sinatra (1.2.6)
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
+    sqlite3 (1.3.3)
     subexec (0.0.4)
     systemu (2.2.0)
     term-ansicolor (1.0.5)
@@ -497,6 +498,7 @@ DEPENDENCIES
   selenium-webdriver (= 0.2.2)
   settingslogic (= 2.0.6)
   sod!
+  sqlite3
   thin (= 1.2.11)
   twitter (= 1.5.0)
   typhoeus
diff --git a/features/step_definitions/oauth_steps.rb b/features/step_definitions/oauth_steps.rb
index 69255e20b..5bfaf2152 100644
--- a/features/step_definitions/oauth_steps.rb
+++ b/features/step_definitions/oauth_steps.rb
@@ -59,8 +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"
+      Process.exec "cd #{Rails.root}/spec/chubbies/ && bundle exec rackup -p #{PORT} #{nullify}"
     end
 
     at_exit do
@@ -76,13 +75,8 @@ class Chubbies
     `kill -9 #{get_pid}`
   end
 
-  def self.ensure_bundled
-    if !(@bundled)
-      Bundler.with_clean_env do
-        `cd #{Rails.root}/spec/chubbies/ && BUNDLE_GEMFILE=Gemfile bundle install`#2> /dev/null 1> /dev/null`
-      end
-      @bundled = true
-    end
+  def self.nullify
+    ENV["CI"] ? '' : "2> /dev/null 1> /dev/null"
   end
 
   def self.ensure_killed
diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile
deleted file mode 100644
index 1bccd1ddb..000000000
--- a/spec/chubbies/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'sinatra'
-gem 'haml'
-
-gem 'json'
-gem 'sqlite3'
-gem 'activerecord', '3.0.3'
-gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
-gem 'jwt', :git => "git://github.com/zhitomirskiyi/ruby-jwt.git"
-
-
diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile
new file mode 120000
index 000000000..df448e9b1
--- /dev/null
+++ b/spec/chubbies/Gemfile
@@ -0,0 +1 @@
+./../../Gemfile
\ No newline at end of file
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
deleted file mode 100644
index ae17d74c6..000000000
--- a/spec/chubbies/Gemfile.lock
+++ /dev/null
@@ -1,64 +0,0 @@
-GIT
-  remote: git://github.com/diaspora/diaspora-client.git
-  revision: cf3bc4ad714c57cc159dd253413363dd5829f4bb
-  specs:
-    diaspora-client (0.0.0)
-      activerecord
-      faraday
-      jwt (>= 0.1.3)
-      oauth2
-      sinatra
-
-GIT
-  remote: git://github.com/zhitomirskiyi/ruby-jwt.git
-  revision: fa7f46b5ac3653e30cf60abc78de9ffb3319dc0c
-  specs:
-    jwt (0.1.3)
-      json (>= 1.2.4)
-
-GEM
-  specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activesupport (3.0.3)
-    addressable (2.2.6)
-    arel (2.0.10)
-    builder (2.1.2)
-    faraday (0.6.1)
-      addressable (~> 2.2.4)
-      multipart-post (~> 1.1.0)
-      rack (>= 1.1.0, < 2)
-    haml (3.1.2)
-    i18n (0.6.0)
-    json (1.4.6)
-    multi_json (1.0.3)
-    multipart-post (1.1.2)
-    oauth2 (0.4.1)
-      faraday (~> 0.6.1)
-      multi_json (>= 0.0.5)
-    rack (1.3.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
-    sqlite3 (1.3.3)
-    tilt (1.3.2)
-    tzinfo (0.3.28)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (= 3.0.3)
-  diaspora-client!
-  haml
-  json
-  jwt!
-  sinatra
-  sqlite3
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
new file mode 120000
index 000000000..2eacd611e
--- /dev/null
+++ b/spec/chubbies/Gemfile.lock
@@ -0,0 +1 @@
+./../../Gemfile.lock
\ No newline at end of file