diff --git a/Gemfile b/Gemfile
index d250cff..5c8b9d2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,6 +50,9 @@ group :test do
 
   # Test coverage
   gem 'simplecov', :require => false
+
+  # Simple Mocks
+  gem 'mocha', :require => 'mocha/api'
 end
 
 group :development, :test do
diff --git a/Gemfile.lock b/Gemfile.lock
index 6235258..ef68a80 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/mezuro/kalibro_entities.git
-  revision: 903dd684d9f3f515aae9703a6fbae036b55b4422
+  revision: ec35266cc3a79465edde66079cd269d494a06768
   specs:
     kalibro_entities (0.0.1)
       savon (~> 2.3.0)
@@ -103,8 +103,11 @@ GEM
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    metaclass (0.0.1)
     mime-types (1.23)
     minitest (4.7.5)
+    mocha (0.14.0)
+      metaclass (~> 0.0.1)
     modernizr-rails (2.6.2.3)
     multi_json (1.7.7)
     net-scp (1.1.2)
@@ -222,6 +225,7 @@ DEPENDENCIES
   jbuilder (~> 1.2)
   jquery-rails
   kalibro_entities!
+  mocha
   modernizr-rails
   rails (= 4.0.0)
   rspec-rails
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 77df501..53ad326 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,7 +18,7 @@ RSpec.configure do |config|
   #
   # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
   #
-  # config.mock_with :mocha
+  config.mock_with :mocha
   # config.mock_with :flexmock
   # config.mock_with :rr
 
--
libgit2 0.21.2