diff --git a/Gemfile b/Gemfile
index 728998e0..7aed65b4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -45,7 +45,9 @@ end
 group :test, :development do
   gem 'ruby-debug', :platforms => :mri_18
   gem 'ruby-debug19', :platforms => :mri_19
+
   # gem 'bushido_stub', :path => '../gems/bushido_stub'
+  gem 'bushido'
 end
 
 group :production do
diff --git a/Gemfile.lock b/Gemfile.lock
index 9d25c6b9..bc17b9e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,11 +11,6 @@ GIT
     xpath (0.1.2)
       nokogiri (~> 1.4)
 
-PATH
-  remote: ../gems/bushido_stub
-  specs:
-    bushido_stub (0.0.1)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -274,7 +269,6 @@ DEPENDENCIES
   autotest
   bson_ext (~> 1.3.0)
   bushido
-  bushido_stub!
   capybara
   cucumber (= 0.8.5)
   cucumber-rails