diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index a51e3e8..b52737c 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -12,8 +12,8 @@ class Noosfero::Plugin
         File.directory?(entry)
       end.each do |dir|
         Rails.configuration.controller_paths << File.join(dir, 'controllers')
-        Dependencies.load_paths << File.join(dir, 'controllers')
-        [ Dependencies.load_paths, $:].each do |path|
+        ActiveSupport::Dependencies.load_paths << File.join(dir, 'controllers')
+        [ ActiveSupport::Dependencies.load_paths, $:].each do |path|
           path << File.join(dir, 'models')
           path << File.join(dir, 'lib')
         end
diff --git a/plugins/bsc/test/functional/bsc_plugin_environment_controller_test.rb b/plugins/bsc/test/functional/bsc_plugin_environment_controller_test.rb
index 4a926e7..36abd93 100644
--- a/plugins/bsc/test/functional/bsc_plugin_environment_controller_test.rb
+++ b/plugins/bsc/test/functional/bsc_plugin_environment_controller_test.rb
@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../../../app/models/uploaded_file'
 # Re-raise errors caught by the controller.
 class BscPluginEnvironmentController; def rescue_action(e) raise e end; end
 
-class BscPluginEnvironmentControllerTest < Test::Unit::TestCase
+class BscPluginEnvironmentControllerTest < ActiveSupport::TestCase
 
   VALID_CNPJ = '94.132.024/0001-48'
 
diff --git a/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb b/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb
index aa7440f..539b7b3 100644
--- a/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb
+++ b/plugins/bsc/test/functional/bsc_plugin_myprofile_controller_test.rb
@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../../../../app/models/uploaded_file'
 # Re-raise errors caught by the controller.
 class BscPluginMyprofileController; def rescue_action(e) raise e end; end
 
-class BscPluginMyprofileControllerTest < Test::Unit::TestCase
+class BscPluginMyprofileControllerTest < ActiveSupport::TestCase
 
   VALID_CNPJ = '94.132.024/0001-48'
 
diff --git a/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb b/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb
index 908b664..e39dbeb 100644
--- a/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb
+++ b/plugins/bsc/test/unit/bsc_plugin/associate_enterprise_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../../app/models/uploaded_file'
 
-class BscPlugin::AssociateEnterpriseTest < Test::Unit::TestCase
+class BscPlugin::AssociateEnterpriseTest < ActiveSupport::TestCase
   VALID_CNPJ = '94.132.024/0001-48'
 
   def setup
diff --git a/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb b/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb
index 43ce88b..a7e36e2 100644
--- a/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb
+++ b/plugins/bsc/test/unit/bsc_plugin/bsc_test.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../../app/models/uploaded_file'
 require File.dirname(__FILE__) + '/../../../lib/ext/enterprise'
 
-class BscPlugin::BscTest < Test::Unit::TestCase
+class BscPlugin::BscTest < ActiveSupport::TestCase
   VALID_CNPJ = '94.132.024/0001-48'
 
   def setup
diff --git a/plugins/bsc/test/unit/bsc_plugin/contract_test.rb b/plugins/bsc/test/unit/bsc_plugin/contract_test.rb
index 8f5871c..d6d866a 100644
--- a/plugins/bsc/test/unit/bsc_plugin/contract_test.rb
+++ b/plugins/bsc/test/unit/bsc_plugin/contract_test.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 #require File.dirname(__FILE__) + '/../../../../../app/models/uploaded_file'
 #require File.dirname(__FILE__) + '/../../../lib/ext/enterprise'
 
-class BscPlugin::ContractTest < Test::Unit::TestCase
+class BscPlugin::ContractTest < ActiveSupport::TestCase
   def setup
     @contract = BscPlugin::Contract.new(:bsc => BscPlugin::Bsc.new, :client_name => 'Marvin')
   end
diff --git a/plugins/bsc/test/unit/bsc_plugin/sale_test.rb b/plugins/bsc/test/unit/bsc_plugin/sale_test.rb
index ca9fd1f..2ae1b3a 100644
--- a/plugins/bsc/test/unit/bsc_plugin/sale_test.rb
+++ b/plugins/bsc/test/unit/bsc_plugin/sale_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 
-class BscPlugin::SaleTest < Test::Unit::TestCase
+class BscPlugin::SaleTest < ActiveSupport::TestCase
   def setup
     @sale = BscPlugin::Sale.new
   end
diff --git a/plugins/bsc/test/unit/bsc_plugin_test.rb b/plugins/bsc/test/unit/bsc_plugin_test.rb
index 299dc57..fbbbeaa 100644
--- a/plugins/bsc/test/unit/bsc_plugin_test.rb
+++ b/plugins/bsc/test/unit/bsc_plugin_test.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../app/models/uploaded_file'
 require File.dirname(__FILE__) + '/../../lib/ext/enterprise'
 
-class BscPluginTest < Test::Unit::TestCase
+class BscPluginTest < ActiveSupport::TestCase
 
   VALID_CNPJ = '94.132.024/0001-48'
 
diff --git a/plugins/bsc/test/unit/ext/enterprise_test.rb b/plugins/bsc/test/unit/ext/enterprise_test.rb
index afb5966..79f20f2 100644
--- a/plugins/bsc/test/unit/ext/enterprise_test.rb
+++ b/plugins/bsc/test/unit/ext/enterprise_test.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../../../../app/models/uploaded_file'
 require File.dirname(__FILE__) + '/../../../../../app/models/enterprise'
 require File.dirname(__FILE__) + '/../../../lib/ext/enterprise'
 
-class EnterpriseTest < Test::Unit::TestCase
+class EnterpriseTest < ActiveSupport::TestCase
   VALID_CNPJ = '94.132.024/0001-48'
 
   def setup
diff --git a/plugins/bsc/test/unit/ext/product_test.rb b/plugins/bsc/test/unit/ext/product_test.rb
index 4ded8fc..62125e3 100644
--- a/plugins/bsc/test/unit/ext/product_test.rb
+++ b/plugins/bsc/test/unit/ext/product_test.rb
@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 require File.dirname(__FILE__) + '/../../../../../app/models/uploaded_file'
 
-class ProductTest < Test::Unit::TestCase
+class ProductTest < ActiveSupport::TestCase
   VALID_CNPJ = '94.132.024/0001-48'
 
   should 'return have bsc' do
diff --git a/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb b/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb
index c999038..e85c033 100644
--- a/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb
+++ b/plugins/send_email/test/functional/send_email_plugin_admin_controller_test.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../controllers/send_email_plugin_admin_con
 # Re-raise errors caught by the controller.
 class SendEmailPluginAdminController; def rescue_action(e) raise e end; end
 
-class SendEmailPluginAdminControllerTest < Test::Unit::TestCase
+class SendEmailPluginAdminControllerTest < ActiveSupport::TestCase
 
   def setup
     @controller = SendEmailPluginAdminController.new
diff --git a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
index eed1687..23248b3 100644
--- a/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
+++ b/plugins/send_email/test/functional/send_email_plugin_base_controller_test.rb
@@ -51,7 +51,7 @@ def run_common_tests
   end
 end
 
-class SendEmailPluginProfileControllerTest < Test::Unit::TestCase
+class SendEmailPluginProfileControllerTest < ActiveSupport::TestCase
   def setup
     @controller = SendEmailPluginProfileController.new
     @request    = ActionController::TestRequest.new
@@ -66,7 +66,7 @@ class SendEmailPluginProfileControllerTest < Test::Unit::TestCase
   run_common_tests()
 end
 
-class SendEmailPluginEnvironmentControllerTest < Test::Unit::TestCase
+class SendEmailPluginEnvironmentControllerTest < ActiveSupport::TestCase
   def setup
     @controller = SendEmailPluginEnvironmentController.new
     @request    = ActionController::TestRequest.new
diff --git a/plugins/send_email/test/unit/send_email_plugin_mail_test.rb b/plugins/send_email/test/unit/send_email_plugin_mail_test.rb
index e1730e8..0f39798 100644
--- a/plugins/send_email/test/unit/send_email_plugin_mail_test.rb
+++ b/plugins/send_email/test/unit/send_email_plugin_mail_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 
-class SendEmailPluginMailTest < Test::Unit::TestCase
+class SendEmailPluginMailTest < ActiveSupport::TestCase
 
   def setup
     @environment = mock()
diff --git a/plugins/send_email/test/unit/send_email_plugin_sender_test.rb b/plugins/send_email/test/unit/send_email_plugin_sender_test.rb
index 6b5f86a..42c03b7 100644
--- a/plugins/send_email/test/unit/send_email_plugin_sender_test.rb
+++ b/plugins/send_email/test/unit/send_email_plugin_sender_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 
-class SendEmailPluginSenderTest < Test::Unit::TestCase
+class SendEmailPluginSenderTest < ActiveSupport::TestCase
 
   def setup
     ActionMailer::Base.delivery_method = :test
diff --git a/plugins/send_email/test/unit/send_email_plugin_test.rb b/plugins/send_email/test/unit/send_email_plugin_test.rb
index 6bcbc4d..60fd29d 100644
--- a/plugins/send_email/test/unit/send_email_plugin_test.rb
+++ b/plugins/send_email/test/unit/send_email_plugin_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 
-class SendEmailPluginTest < Test::Unit::TestCase
+class SendEmailPluginTest < ActiveSupport::TestCase
 
   def setup
     @plugin = SendEmailPlugin.new
diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
index c60b6e3..955084b 100644
--- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
+++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_myprof
 # Re-raise errors caught by the controller.
 class ShoppingCartPluginMyprofileController; def rescue_action(e) raise e end; end
 
-class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase
+class ShoppingCartPluginMyprofileControllerTest < ActiveSupport::TestCase
 
   TIME_FORMAT = '%Y-%m-%d'
 
diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb
index ae6497c..3b6eaa7 100644
--- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb
+++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb
@@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_profil
 # Re-raise errors caught by the controller.
 class ShoppingCartPluginProfileController; def rescue_action(e) raise e end; end
 
-class ShoppingCartPluginProfileControllerTest < Test::Unit::TestCase
+class ShoppingCartPluginProfileControllerTest < ActiveSupport::TestCase
 
   def setup
     @controller = ShoppingCartPluginProfileController.new
diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb
index 977780a..14b0555 100644
--- a/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb
+++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin/cart_helper_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../../test/test_helper'
 
-class ShoppingCartPlugin::CartHelperTest < Test::Unit::TestCase
+class ShoppingCartPlugin::CartHelperTest < ActiveSupport::TestCase
 
   include ShoppingCartPlugin::CartHelper
 
diff --git a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
index 595c044..ab94f33 100644
--- a/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
+++ b/plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../../test/test_helper'
 
-class ShoppingCartPluginTest < Test::Unit::TestCase
+class ShoppingCartPluginTest < ActiveSupport::TestCase
 
   def setup
     @shopping_cart = ShoppingCartPlugin.new
--
libgit2 0.21.2