diff --git a/Gemfile b/Gemfile
index 1dbd9d68a..1b57e457b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -94,6 +94,6 @@ group :test do
   gem 'rspec-instafail', '>= 0.1.7', :require => false
   gem 'fuubar'
 
-  gem 'diaspora-client', :git => 'git@github.com:diaspora/diaspora-client.git'
-                           #:path => "~/workspace/diaspora-client" 
+  gem 'diaspora-client', #:git => 'git@github.com:diaspora/diaspora-client.git'
+                          :path => "~/workspace/diaspora-client" 
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index d8322e2dc..3a87666d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,9 +37,8 @@ GIT
       addressable (>= 2.1.1)
       eventmachine (>= 0.12.9)
 
-GIT
-  remote: git@github.com:diaspora/diaspora-client.git
-  revision: 17ff61247dc6f272604fb517d6eacf4a0683a721
+PATH
+  remote: ~/workspace/diaspora-client
   specs:
     diaspora-client (0.0.0)
       activerecord
diff --git a/spec/chubbies/Gemfile b/spec/chubbies/Gemfile
index 4a9a96a65..e756b9bb8 100644
--- a/spec/chubbies/Gemfile
+++ b/spec/chubbies/Gemfile
@@ -7,5 +7,5 @@ gem 'json'
 gem 'shotgun'
 gem 'sqlite3'
 gem 'activerecord', '3.0.3'
-gem 'diaspora-client',  #:path => "~/workspace/diaspora-client"
-                        :git => 'git@github.com:diaspora/diaspora-client.git'
+gem 'diaspora-client',  :path => "~/workspace/diaspora-client"
+                        #:git => 'git@github.com:diaspora/diaspora-client.git'
diff --git a/spec/chubbies/Gemfile.lock b/spec/chubbies/Gemfile.lock
index 29d9a515f..a82f71909 100644
--- a/spec/chubbies/Gemfile.lock
+++ b/spec/chubbies/Gemfile.lock
@@ -1,10 +1,8 @@
-GIT
-  remote: git@github.com:diaspora/diaspora-client.git
-  revision: 17ff61247dc6f272604fb517d6eacf4a0683a721
+PATH
+  remote: ~/workspace/diaspora-client
   specs:
     diaspora-client (0.0.0)
       activerecord
-      em-synchrony
       faraday
       oauth2
       sinatra
@@ -25,14 +23,11 @@ GEM
     addressable (2.2.6)
     arel (2.0.10)
     builder (2.1.2)
-    em-synchrony (0.2.0)
-      eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
-    haml (3.0.18)
+    haml (3.0.25)
     i18n (0.6.0)
     json (1.4.6)
     multi_json (1.0.3)
@@ -40,15 +35,15 @@ GEM
     oauth2 (0.4.1)
       faraday (~> 0.6.1)
       multi_json (>= 0.0.5)
-    rack (1.2.2)
+    rack (1.2.3)
     shotgun (0.9)
       rack (>= 1.0)
     sinatra (1.2.6)
       rack (~> 1.1)
-      tilt (>= 1.2.2, < 2.0)
+      tilt (< 2.0, >= 1.2.2)
     sqlite3 (1.3.3)
-    tilt (1.3)
-    tzinfo (0.3.27)
+    tilt (1.3.2)
+    tzinfo (0.3.28)
 
 PLATFORMS
   ruby
diff --git a/spec/chubbies/app.rb b/spec/chubbies/app.rb
index d0702bc6a..03462a5dd 100644
--- a/spec/chubbies/app.rb
+++ b/spec/chubbies/app.rb
@@ -43,6 +43,8 @@ module Chubbies
   DiasporaClient.config do |d|
     d.private_key_path = File.dirname(__FILE__) + "/chubbies.private.pem"
     d.public_key_path = File.dirname(__FILE__) + "/chubbies.public.pem"
+    d.test_mode = true
+    d.application_url = "http://localhost:9292"
   end
 
   class App < DiasporaClient::App