diff --git a/config/application.rb b/config/application.rb
index 59aaed7..355e954 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -29,7 +29,7 @@ module Noosfero
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W( #{Rails.root.join('app', 'sweepers')} )
-    config.autoload_paths += Dir["#{config.root}/lib/**/"]
+    config.autoload_paths += Dir["#{config.root}/lib"]
     config.autoload_paths += Dir["#{config.root}/app/controllers/**/"]
     config.autoload_paths += %W( #{Rails.root.join('test', 'mocks', Rails.env)} )
 
diff --git a/lib/noosfero/test.rb b/lib/noosfero/test.rb
deleted file mode 100644
index f166d7d..0000000
--- a/lib/noosfero/test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-module Noosfero::Test
-
-  def get(path, parameters = nil, headers = nil)
-    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
-  end
-
-  def post(path, parameters = nil, headers = nil)
-    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
-  end
-
-  module ClassMethods
-    def noosfero_test(parameters)
-      instance_variable_set('@noosfero_test_extra_parameters', parameters)
-      def extra_parameters
-        @noosfero_test_extra_parameters
-      end
-      include Noosfero::Test
-    end
-  end
-
-end
-
-Test::Unit::TestCase.send(:extend, Noosfero::Test::ClassMethods)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 96366a5..97bab83 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'rails/test_help'
 require 'mocha'
 
-require 'noosfero/test'
 require 'authenticated_test_helper'
 require File.dirname(__FILE__) + '/factories'
 require File.dirname(__FILE__) + '/noosfero_doc_test'
@@ -76,6 +75,21 @@ class ActiveSupport::TestCase
 
   end
 
+  def self.noosfero_test parameters
+    instance_variable_set('@noosfero_test_extra_parameters', parameters)
+    def extra_parameters
+      @noosfero_test_extra_parameters
+    end
+  end
+
+  def get(path, parameters = nil, headers = nil)
+    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters) , headers)
+  end
+
+  def post(path, parameters = nil, headers = nil)
+    super(path, (parameters ? self.class.extra_parameters.merge(parameters) : self.class.extra_parameters), headers)
+  end
+
   alias :ok :assert_block
 
   def assert_equivalent(enum1, enum2)
--
libgit2 0.21.2