diff --git a/Gemfile b/Gemfile
index 56906d1d..fc485caa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,7 +9,7 @@ gem 'devise', '= 1.1.3'
 
 gem 'mongoid', '~> 2.0.0.rc.7'
 gem 'bson_ext', '~> 1.2.1'
-gem 'locomotive_mongoid_acts_as_tree', '0.1.5.5', :require => 'mongoid_acts_as_tree' #, :path => '../gems/acts_as_tree'
+gem 'locomotive_mongoid_acts_as_tree', '0.1.5.5', :require => 'mongoid_acts_as_tree'
 gem 'will_paginate'
 
 gem 'haml', '3.0.25'
@@ -18,8 +18,8 @@ gem 'formtastic', '~> 1.2.3'
 gem 'inherited_resources', '~> 1.1.2'
 
 gem 'rmagick', '2.12.2'
-# gem 'locomotive_carrierwave', '0.5.0.1.beta2', :require => 'carrierwave'
-gem 'carrierwave', :path => '/Users/didier/Desktop/carrierwave'
+gem 'locomotive_carrierwave', '0.5.0.1.beta2', :require => 'carrierwave'
+# gem 'carrierwave', :path => '/Users/didier/Desktop/carrierwave'
 
 gem 'custom_fields', '1.0.0.beta.4'
 gem 'fog', '0.3.7'
diff --git a/Gemfile.lock b/Gemfile.lock
index e73cc7db..070f5dd8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,12 +5,6 @@ GIT
     mocha (0.9.11.20110203233621)
       rake
 
-PATH
-  remote: /Users/didier/Desktop/carrierwave
-  specs:
-    carrierwave (0.5.1)
-      activesupport (~> 3.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -62,7 +56,7 @@ GEM
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
     celerity (0.8.7)
-    childprocess (0.1.6)
+    childprocess (0.1.7)
       ffi (~> 0.6.3)
     closure-compiler (1.0.0)
     columnize (0.3.2)
@@ -143,7 +137,7 @@ GEM
     linecache (0.43)
     linecache19 (0.5.11)
       ruby_core_source (>= 0.1.4)
-    locomotive_carrierwave (0.5.0.1)
+    locomotive_carrierwave (0.5.0.1.beta2)
       activesupport (~> 3.0)
     locomotive_jammit-s3 (0.5.4.4)
       jammit (>= 0.5.4)
@@ -264,7 +258,6 @@ DEPENDENCIES
   autotest
   bson_ext (~> 1.2.1)
   capybara
-  carrierwave!
   cucumber (= 0.8.5)
   cucumber-rails
   custom_fields (= 1.0.0.beta.4)
@@ -281,6 +274,7 @@ DEPENDENCIES
   httparty (>= 0.6.1)
   inherited_resources (~> 1.1.2)
   launchy
+  locomotive_carrierwave (= 0.5.0.1.beta2)
   locomotive_jammit-s3
   locomotive_liquid (= 2.2.2)
   locomotive_mongoid_acts_as_tree (= 0.1.5.5)
diff --git a/Rakefile b/Rakefile
index cee868bb..e1a5cfdf 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,4 +15,6 @@ end
 desc "build the gem and release it to rubygems.org"
 task :release => :gem do
   sh "gem push pkg/locomotive_cms-#{gemspec.version}.gem"
-end
\ No newline at end of file
+end
+
+task :default => [:spec, :cucumber]
\ No newline at end of file