diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 7d86167..8c4c0f0 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'account_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 99ea6fb..5350c93 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'admin_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index c614231..756c896 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'admin_panel_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index f6c1dc4..347ae56 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'test_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/catalog_controller_test.rb b/test/functional/catalog_controller_test.rb
index 9ba4849..89f50cc 100644
--- a/test/functional/catalog_controller_test.rb
+++ b/test/functional/catalog_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'catalog_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/categories_controller_test.rb b/test/functional/categories_controller_test.rb
index dc65520..f065110 100644
--- a/test/functional/categories_controller_test.rb
+++ b/test/functional/categories_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'categories_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/chat_controller_test.rb b/test/functional/chat_controller_test.rb
index 384720d..6f6c865 100644
--- a/test/functional/chat_controller_test.rb
+++ b/test/functional/chat_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ChatControllerTest < ActionController::TestCase
 
diff --git a/test/functional/cms_controller_test.rb b/test/functional/cms_controller_test.rb
index e83679b..5c09b4b 100644
--- a/test/functional/cms_controller_test.rb
+++ b/test/functional/cms_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'cms_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/comment_controller_test.rb b/test/functional/comment_controller_test.rb
index c20f21d..8340c35 100644
--- a/test/functional/comment_controller_test.rb
+++ b/test/functional/comment_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'comment_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/contact_controller_test.rb b/test/functional/contact_controller_test.rb
index 7d54b97..5006770 100644
--- a/test/functional/contact_controller_test.rb
+++ b/test/functional/contact_controller_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'contact_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index 9517922..9be1da0 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'content_viewer_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/doc_controller_test.rb b/test/functional/doc_controller_test.rb
index 35ba553..61a3a33 100644
--- a/test/functional/doc_controller_test.rb
+++ b/test/functional/doc_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DocControllerTest < ActionController::TestCase
 
diff --git a/test/functional/edit_template_controller_test.rb b/test/functional/edit_template_controller_test.rb
index 3f5572b..75f81dc 100644
--- a/test/functional/edit_template_controller_test.rb
+++ b/test/functional/edit_template_controller_test.rb
@@ -1,6 +1,6 @@
 # FIXME: this tests must me moved into design plugin
 
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'edit_template_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/embed_controller_test.rb b/test/functional/embed_controller_test.rb
index 8cc7cff..d3d7ccc 100644
--- a/test/functional/embed_controller_test.rb
+++ b/test/functional/embed_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EmbedControllerTest < ActionController::TestCase
 
diff --git a/test/functional/enterprise_registration_controller_test.rb b/test/functional/enterprise_registration_controller_test.rb
index cc2f9a9..58c1bd1 100644
--- a/test/functional/enterprise_registration_controller_test.rb
+++ b/test/functional/enterprise_registration_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'enterprise_registration_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/enterprise_validation_controller_test.rb b/test/functional/enterprise_validation_controller_test.rb
index a2f4002..d43758d 100644
--- a/test/functional/enterprise_validation_controller_test.rb
+++ b/test/functional/enterprise_validation_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'enterprise_validation_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/environment_design_controller_test.rb b/test/functional/environment_design_controller_test.rb
index 4b37a79..51dd1c8 100644
--- a/test/functional/environment_design_controller_test.rb
+++ b/test/functional/environment_design_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'environment_design_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/environment_role_manager_controller_test.rb b/test/functional/environment_role_manager_controller_test.rb
index 822933c..ad1cad3 100644
--- a/test/functional/environment_role_manager_controller_test.rb
+++ b/test/functional/environment_role_manager_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'environment_role_manager_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/environment_themes_controller_test.rb b/test/functional/environment_themes_controller_test.rb
index a4c19f4..c9cff84 100644
--- a/test/functional/environment_themes_controller_test.rb
+++ b/test/functional/environment_themes_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnvironmentThemesController; def rescue_action(e) raise e end; end
 
diff --git a/test/functional/events_controller_test.rb b/test/functional/events_controller_test.rb
index 479317e..b1c6f69 100644
--- a/test/functional/events_controller_test.rb
+++ b/test/functional/events_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EventsControllerTest < ActionController::TestCase
 
diff --git a/test/functional/favorite_enterprises_controller_test.rb b/test/functional/favorite_enterprises_controller_test.rb
index 78412af..9e5b9ca 100644
--- a/test/functional/favorite_enterprises_controller_test.rb
+++ b/test/functional/favorite_enterprises_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'favorite_enterprises_controller'
 
 class FavoriteEnterprisesController; def rescue_action(e) raise e end; end
diff --git a/test/functional/features_controller_test.rb b/test/functional/features_controller_test.rb
index 47d9276..d906b66 100644
--- a/test/functional/features_controller_test.rb
+++ b/test/functional/features_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'features_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/friends_controller_test.rb b/test/functional/friends_controller_test.rb
index 09c1b34..9ff5f65 100644
--- a/test/functional/friends_controller_test.rb
+++ b/test/functional/friends_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'friends_controller'
 
 class FriendsController; def rescue_action(e) raise e end; end
diff --git a/test/functional/home_controller_test.rb b/test/functional/home_controller_test.rb
index 855c61e..d6f2b4b 100644
--- a/test/functional/home_controller_test.rb
+++ b/test/functional/home_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'home_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/invite_controller_test.rb b/test/functional/invite_controller_test.rb
index d1edcc1..71ac8b7 100644
--- a/test/functional/invite_controller_test.rb
+++ b/test/functional/invite_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InviteControllerTest < ActionController::TestCase
 
diff --git a/test/functional/licenses_controller_test.rb b/test/functional/licenses_controller_test.rb
index e06c8e3..79b49ec 100644
--- a/test/functional/licenses_controller_test.rb
+++ b/test/functional/licenses_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'licenses_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/mailconf_controller_test.rb b/test/functional/mailconf_controller_test.rb
index cb64f7f..a11a1d0 100644
--- a/test/functional/mailconf_controller_test.rb
+++ b/test/functional/mailconf_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MailconfControllerTest < ActionController::TestCase
 
diff --git a/test/functional/manage_products_controller_test.rb b/test/functional/manage_products_controller_test.rb
index 1803b98..2285b77 100644
--- a/test/functional/manage_products_controller_test.rb
+++ b/test/functional/manage_products_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'manage_products_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/map_balloon_controller_test.rb b/test/functional/map_balloon_controller_test.rb
index 16be751..b447cba 100644
--- a/test/functional/map_balloon_controller_test.rb
+++ b/test/functional/map_balloon_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'map_balloon_controller'
 
 
diff --git a/test/functional/maps_controller_test.rb b/test/functional/maps_controller_test.rb
index 603385c..850b46e 100644
--- a/test/functional/maps_controller_test.rb
+++ b/test/functional/maps_controller_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'maps_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/memberships_controller_test.rb b/test/functional/memberships_controller_test.rb
index dbaa697..6365744 100644
--- a/test/functional/memberships_controller_test.rb
+++ b/test/functional/memberships_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'memberships_controller'
 
 
diff --git a/test/functional/my_profile_controller_test.rb b/test/functional/my_profile_controller_test.rb
index 91776f0..847c5c0 100644
--- a/test/functional/my_profile_controller_test.rb
+++ b/test/functional/my_profile_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'my_profile_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/plugin_admin_controller_test.rb b/test/functional/plugin_admin_controller_test.rb
index 88eacef..b17d63f 100644
--- a/test/functional/plugin_admin_controller_test.rb
+++ b/test/functional/plugin_admin_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PluginAdminController
   def index
diff --git a/test/functional/plugins_controller_test.rb b/test/functional/plugins_controller_test.rb
index 37a1f9e..7b87632 100644
--- a/test/functional/plugins_controller_test.rb
+++ b/test/functional/plugins_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'plugins_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/profile_controller_test.rb b/test/functional/profile_controller_test.rb
index 8132c13..f1bcdd7 100644
--- a/test/functional/profile_controller_test.rb
+++ b/test/functional/profile_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'profile_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/profile_design_controller_test.rb b/test/functional/profile_design_controller_test.rb
index 0d9c6c3..b0dde3d 100644
--- a/test/functional/profile_design_controller_test.rb
+++ b/test/functional/profile_design_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'profile_design_controller'
 
 class ProfileDesignController; def rescue_action(e) raise e end; end
diff --git a/test/functional/profile_editor_controller_test.rb b/test/functional/profile_editor_controller_test.rb
index d1f014f..88f9aab 100644
--- a/test/functional/profile_editor_controller_test.rb
+++ b/test/functional/profile_editor_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'profile_editor_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/profile_members_controller_test.rb b/test/functional/profile_members_controller_test.rb
index 4f10269..bc3bdfa 100644
--- a/test/functional/profile_members_controller_test.rb
+++ b/test/functional/profile_members_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'profile_members_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/profile_search_controller_test.rb b/test/functional/profile_search_controller_test.rb
index 5ad31d1..6f05e51 100644
--- a/test/functional/profile_search_controller_test.rb
+++ b/test/functional/profile_search_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'profile_search_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/profile_themes_controller_test.rb b/test/functional/profile_themes_controller_test.rb
index 793c99f..ee53a6e 100644
--- a/test/functional/profile_themes_controller_test.rb
+++ b/test/functional/profile_themes_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 # require 'profile_themes_controller'
 
 class ProfileThemesController; def rescue_action(e) raise e end; end
diff --git a/test/functional/public_controller_test.rb b/test/functional/public_controller_test.rb
index 1ddc726..8e6fb26 100644
--- a/test/functional/public_controller_test.rb
+++ b/test/functional/public_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'public_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/region_validators_controller_test.rb b/test/functional/region_validators_controller_test.rb
index abdf0aa..7ecf997 100644
--- a/test/functional/region_validators_controller_test.rb
+++ b/test/functional/region_validators_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'region_validators_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/role_controller_test.rb b/test/functional/role_controller_test.rb
index 1ea169e..2027325 100644
--- a/test/functional/role_controller_test.rb
+++ b/test/functional/role_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'role_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 61a97a7..af79978 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'search_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/spam_controller_test.rb b/test/functional/spam_controller_test.rb
index 6b19650..e38f259 100644
--- a/test/functional/spam_controller_test.rb
+++ b/test/functional/spam_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SpamControllerTest < ActionController::TestCase
 
diff --git a/test/functional/system_controller_test.rb b/test/functional/system_controller_test.rb
index 5a81411..2e6cc3a 100644
--- a/test/functional/system_controller_test.rb
+++ b/test/functional/system_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'system_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/tasks_controller_test.rb b/test/functional/tasks_controller_test.rb
index 3517bba..9d3f8b3 100644
--- a/test/functional/tasks_controller_test.rb
+++ b/test/functional/tasks_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'tasks_controller'
 
 class TasksController; def rescue_action(e) raise e end; end
diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb
index 413d79f..0359827 100644
--- a/test/functional/templates_controller_test.rb
+++ b/test/functional/templates_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'templates_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/trusted_sites_controller_test.rb b/test/functional/trusted_sites_controller_test.rb
index bb83bdd..62edf85 100644
--- a/test/functional/trusted_sites_controller_test.rb
+++ b/test/functional/trusted_sites_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'trusted_sites_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
index 2f4c8e7..70e52fc 100644
--- a/test/functional/users_controller_test.rb
+++ b/test/functional/users_controller_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'users_controller'
 
 # Re-raise errors caught by the controller.
diff --git a/test/integration/approve_reject_enterprise_test.rb b/test/integration/approve_reject_enterprise_test.rb
index 83f0c67..42cab92 100644
--- a/test/integration/approve_reject_enterprise_test.rb
+++ b/test/integration/approve_reject_enterprise_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class ApproveRejectEnterpriseTest < ActionController::IntegrationTest
   all_fixtures
diff --git a/test/integration/assets_menu_test.rb b/test/integration/assets_menu_test.rb
index d3b115c..fd13804 100644
--- a/test/integration/assets_menu_test.rb
+++ b/test/integration/assets_menu_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class AssetsMenuTest < ActionController::IntegrationTest
 
diff --git a/test/integration/assigning_validator_organizations_to_regions_test.rb b/test/integration/assigning_validator_organizations_to_regions_test.rb
index 20a8d07..f8b4fcf 100644
--- a/test/integration/assigning_validator_organizations_to_regions_test.rb
+++ b/test/integration/assigning_validator_organizations_to_regions_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class AssigningValidatorOrganizationsToRegionsTest < ActionController::IntegrationTest
 
diff --git a/test/integration/blocks_test.rb b/test/integration/blocks_test.rb
index 8ff4845..04eb683 100644
--- a/test/integration/blocks_test.rb
+++ b/test/integration/blocks_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class BlocksTest < ActionController::IntegrationTest
   def blog_on_article_block_bootstrap
diff --git a/test/integration/categories_menu_test.rb b/test/integration/categories_menu_test.rb
index ebac9f2..ed6a8eb 100644
--- a/test/integration/categories_menu_test.rb
+++ b/test/integration/categories_menu_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class CategoriesMenuTest < ActionController::IntegrationTest
 
diff --git a/test/integration/controller_naming_test.rb b/test/integration/controller_naming_test.rb
index dec7674..16313bc 100644
--- a/test/integration/controller_naming_test.rb
+++ b/test/integration/controller_naming_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class ControllerNamingTest < ActionController::IntegrationTest
 
diff --git a/test/integration/editing_person_info_test.rb b/test/integration/editing_person_info_test.rb
index 9873f2a..00b21a2 100644
--- a/test/integration/editing_person_info_test.rb
+++ b/test/integration/editing_person_info_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class EditingPersonInfoTest < ActionController::IntegrationTest
 
diff --git a/test/integration/enable_disable_features_test.rb b/test/integration/enable_disable_features_test.rb
index 95b86ce..70975b9 100644
--- a/test/integration/enable_disable_features_test.rb
+++ b/test/integration/enable_disable_features_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class EnableDisableFeaturesTest < ActionController::IntegrationTest
   all_fixtures
diff --git a/test/integration/enterprise_registration_test.rb b/test/integration/enterprise_registration_test.rb
index c2c0f00..92f2489 100644
--- a/test/integration/enterprise_registration_test.rb
+++ b/test/integration/enterprise_registration_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class EnterpriseRegistrationTest < ActionController::IntegrationTest
 
diff --git a/test/integration/forgot_password_test.rb b/test/integration/forgot_password_test.rb
index 1db566a..133b33c 100644
--- a/test/integration/forgot_password_test.rb
+++ b/test/integration/forgot_password_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class ForgotPasswordTest < ActionController::IntegrationTest
 
diff --git a/test/integration/http_caching_test.rb b/test/integration/http_caching_test.rb
index 0f1980c..0bffb33 100644
--- a/test/integration/http_caching_test.rb
+++ b/test/integration/http_caching_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative "../test_helper"
 
 class HttpCachingTest < ActionController::IntegrationTest
 
diff --git a/test/integration/login_to_the_application_test.rb b/test/integration/login_to_the_application_test.rb
index 86d5cf9..4ddb9fe 100644
--- a/test/integration/login_to_the_application_test.rb
+++ b/test/integration/login_to_the_application_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class LoginToTheApplicationTest < ActionController::IntegrationTest
   fixtures :users, :environments, :profiles
diff --git a/test/integration/manage_documents_test.rb b/test/integration/manage_documents_test.rb
index e14de90..00b0093 100644
--- a/test/integration/manage_documents_test.rb
+++ b/test/integration/manage_documents_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class ManageDocumentsTest < ActionController::IntegrationTest
 
diff --git a/test/integration/manage_friendships_test.rb b/test/integration/manage_friendships_test.rb
index 70867db..babac0b 100644
--- a/test/integration/manage_friendships_test.rb
+++ b/test/integration/manage_friendships_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class ManageFriendshipsTest < ActionController::IntegrationTest
 
diff --git a/test/integration/online_doc_test.rb b/test/integration/online_doc_test.rb
index 4cf1124..8dc6e97 100644
--- a/test/integration/online_doc_test.rb
+++ b/test/integration/online_doc_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class OnlineDocTest < ActionController::IntegrationTest
 
diff --git a/test/integration/performance_test.rb b/test/integration/performance_test.rb
index fa1fa07..ef55305 100644
--- a/test/integration/performance_test.rb
+++ b/test/integration/performance_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 require 'benchmark'
 
 class PerformanceTest < ActionController::IntegrationTest
diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index 3bc5124..687aea5 100644
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../../test_helper', __FILE__)
+require_relative "../test_helper"
 
 class RoutingTest < ActionController::IntegrationTest
 
diff --git a/test/integration/search_popup_test.rb b/test/integration/search_popup_test.rb
index e025219..0d6e3d3 100644
--- a/test/integration/search_popup_test.rb
+++ b/test/integration/search_popup_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class SearchPopupTest < ActionController::IntegrationTest
 
diff --git a/test/integration/signup_test.rb b/test/integration/signup_test.rb
index 254c266..06abac1 100644
--- a/test/integration/signup_test.rb
+++ b/test/integration/signup_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class SignupTest < ActionController::IntegrationTest
   all_fixtures
diff --git a/test/integration/user_registers_at_the_application_test.rb b/test/integration/user_registers_at_the_application_test.rb
index 12b1e45..87ddebb 100644
--- a/test/integration/user_registers_at_the_application_test.rb
+++ b/test/integration/user_registers_at_the_application_test.rb
@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../test_helper"
+require_relative "../test_helper"
 
 class UserRegistersAtTheApplicationTest < ActionController::IntegrationTest
   fixtures :users, :environments, :profiles
diff --git a/test/unit/abuse_complaint_test.rb b/test/unit/abuse_complaint_test.rb
index f1b1e7c..c03fca1 100644
--- a/test/unit/abuse_complaint_test.rb
+++ b/test/unit/abuse_complaint_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AbuseComplaintTest < ActiveSupport::TestCase
 
diff --git a/test/unit/abuse_report_test.rb b/test/unit/abuse_report_test.rb
index 7c81c96..12cdd60 100644
--- a/test/unit/abuse_report_test.rb
+++ b/test/unit/abuse_report_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AbuseReportTest < ActiveSupport::TestCase
 
diff --git a/test/unit/account_helper_test.rb b/test/unit/account_helper_test.rb
index 4f39e83..c64b2c3 100644
--- a/test/unit/account_helper_test.rb
+++ b/test/unit/account_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AccountHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/action_tracker_ext_test.rb b/test/unit/action_tracker_ext_test.rb
index bab4ae0..e4ce367 100644
--- a/test/unit/action_tracker_ext_test.rb
+++ b/test/unit/action_tracker_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActionTrackerExtTest < ActiveSupport::TestCase
   should 'increase person activities_count on new activity' do
diff --git a/test/unit/action_tracker_notification_test.rb b/test/unit/action_tracker_notification_test.rb
index dd83b65..99eec0d 100644
--- a/test/unit/action_tracker_notification_test.rb
+++ b/test/unit/action_tracker_notification_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActionTrackerNotificationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/activities_counter_cache_job_test.rb b/test/unit/activities_counter_cache_job_test.rb
index 9f1881d..2fad923 100644
--- a/test/unit/activities_counter_cache_job_test.rb
+++ b/test/unit/activities_counter_cache_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActivitiesCounterCacheJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/acts_as_filesystem_test.rb b/test/unit/acts_as_filesystem_test.rb
index bdbc5bc..874d2c5 100644
--- a/test/unit/acts_as_filesystem_test.rb
+++ b/test/unit/acts_as_filesystem_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActsAsFilesystemTest < ActiveSupport::TestCase
 
diff --git a/test/unit/acts_as_having_boxes_test.rb b/test/unit/acts_as_having_boxes_test.rb
index 71ba4de..eba8ec8 100644
--- a/test/unit/acts_as_having_boxes_test.rb
+++ b/test/unit/acts_as_having_boxes_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActsAsHavingBoxesTest < ActiveSupport::TestCase
 
diff --git a/test/unit/acts_as_having_settings_test.rb b/test/unit/acts_as_having_settings_test.rb
index f1ff1c5..2afa4fc 100644
--- a/test/unit/acts_as_having_settings_test.rb
+++ b/test/unit/acts_as_having_settings_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ActsAsHavingSettingsTest < ActiveSupport::TestCase
 
diff --git a/test/unit/add_friend_test.rb b/test/unit/add_friend_test.rb
index 3cf18a5..d5406da 100644
--- a/test/unit/add_friend_test.rb
+++ b/test/unit/add_friend_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AddFriendTest < ActiveSupport::TestCase
 
diff --git a/test/unit/add_member_test.rb b/test/unit/add_member_test.rb
index a251e97..249ebb5 100644
--- a/test/unit/add_member_test.rb
+++ b/test/unit/add_member_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AddMemberTest < ActiveSupport::TestCase
 
diff --git a/test/unit/application_helper_test.rb b/test/unit/application_helper_test.rb
index 84c70b1..2b599ca 100644
--- a/test/unit/application_helper_test.rb
+++ b/test/unit/application_helper_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ApplicationHelperTest < ActionView::TestCase
 
diff --git a/test/unit/approve_article_test.rb b/test/unit/approve_article_test.rb
index 5900cc0..386ffb1 100644
--- a/test/unit/approve_article_test.rb
+++ b/test/unit/approve_article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ApproveArticleTest < ActiveSupport::TestCase
 
diff --git a/test/unit/approve_comment_test.rb b/test/unit/approve_comment_test.rb
index 0e0a365..0c1d8a6 100644
--- a/test/unit/approve_comment_test.rb
+++ b/test/unit/approve_comment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ApproveCommentTest < ActiveSupport::TestCase
 
diff --git a/test/unit/array_core_ext_test.rb b/test/unit/array_core_ext_test.rb
index 035dea6..87c4eab 100644
--- a/test/unit/array_core_ext_test.rb
+++ b/test/unit/array_core_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # tests for Array core extension. See lib/noosfero/core_ext/array.rb
 class StringCoreExtTest < ActiveSupport::TestCase
diff --git a/test/unit/article_block_test.rb b/test/unit/article_block_test.rb
index 107070a..038f357 100644
--- a/test/unit/article_block_test.rb
+++ b/test/unit/article_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ArticleBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/article_categorization_test.rb b/test/unit/article_categorization_test.rb
index 604a235..fa00670 100644
--- a/test/unit/article_categorization_test.rb
+++ b/test/unit/article_categorization_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ArticleCategorizationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/article_test.rb b/test/unit/article_test.rb
index 315afee..f7c5be5 100644
--- a/test/unit/article_test.rb
+++ b/test/unit/article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ArticleTest < ActiveSupport::TestCase
 
diff --git a/test/unit/assets_helper_test.rb b/test/unit/assets_helper_test.rb
index 41c6eed..4fe8709 100644
--- a/test/unit/assets_helper_test.rb
+++ b/test/unit/assets_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class AssetsHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/block_helper_test.rb b/test/unit/block_helper_test.rb
index a039cc2..8a2afb3 100644
--- a/test/unit/block_helper_test.rb
+++ b/test/unit/block_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BlockHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/block_test.rb b/test/unit/block_test.rb
index 58dfa45..b202815 100644
--- a/test/unit/block_test.rb
+++ b/test/unit/block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/blog_archives_block_test.rb b/test/unit/blog_archives_block_test.rb
index c927323..40b0d8b 100644
--- a/test/unit/blog_archives_block_test.rb
+++ b/test/unit/blog_archives_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BlogArchivesBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/blog_helper_test.rb b/test/unit/blog_helper_test.rb
index 5c718d7..b49e37e 100644
--- a/test/unit/blog_helper_test.rb
+++ b/test/unit/blog_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BlogHelperTest < ActionView::TestCase
 
diff --git a/test/unit/blog_test.rb b/test/unit/blog_test.rb
index 3c2e99e..da78199 100644
--- a/test/unit/blog_test.rb
+++ b/test/unit/blog_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BlogTest < ActiveSupport::TestCase
 
diff --git a/test/unit/box_test.rb b/test/unit/box_test.rb
index d9f7e07..8a8cf7b 100644
--- a/test/unit/box_test.rb
+++ b/test/unit/box_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class BoxTest < ActiveSupport::TestCase
 
diff --git a/test/unit/boxes_helper_test.rb b/test/unit/boxes_helper_test.rb
index 32c63ed..fb5682e 100644
--- a/test/unit/boxes_helper_test.rb
+++ b/test/unit/boxes_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require File.dirname(__FILE__) + '/../../app/helpers/boxes_helper'
 
 class BoxesHelperTest < ActionView::TestCase
diff --git a/test/unit/catalog_helper_test.rb b/test/unit/catalog_helper_test.rb
index 32dde21..7ea2a3f 100644
--- a/test/unit/catalog_helper_test.rb
+++ b/test/unit/catalog_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CatalogHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/categories_block_test.rb b/test/unit/categories_block_test.rb
index 918eca1..8117500 100644
--- a/test/unit/categories_block_test.rb
+++ b/test/unit/categories_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CategoriesBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/categories_helper_test.rb b/test/unit/categories_helper_test.rb
index 768e235..922ce22 100644
--- a/test/unit/categories_helper_test.rb
+++ b/test/unit/categories_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CategoriesHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/category_test.rb b/test/unit/category_test.rb
index 7b665d7..45185bb 100644
--- a/test/unit/category_test.rb
+++ b/test/unit/category_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # FIXME move the filesystem-related tests out here
 class CategoryTest < ActiveSupport::TestCase
diff --git a/test/unit/certifier_test.rb b/test/unit/certifier_test.rb
index 8b6f33d..b86d2ab 100644
--- a/test/unit/certifier_test.rb
+++ b/test/unit/certifier_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CertifierTest < ActiveSupport::TestCase
 
diff --git a/test/unit/change_password_test.rb b/test/unit/change_password_test.rb
index 1bab714..6e8ce9e 100644
--- a/test/unit/change_password_test.rb
+++ b/test/unit/change_password_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ChangePasswordTest < ActiveSupport::TestCase
 
diff --git a/test/unit/chat_helper_test.rb b/test/unit/chat_helper_test.rb
index 1f47dac..8166127 100644
--- a/test/unit/chat_helper_test.rb
+++ b/test/unit/chat_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ChatHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/city_test.rb b/test/unit/city_test.rb
index 662809e..5e916c1 100644
--- a/test/unit/city_test.rb
+++ b/test/unit/city_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper.rb'
+require_relative "../test_helper"
 
 class CityTest < ActiveSupport::TestCase
   # Replace this with your real tests.
diff --git a/test/unit/cms_helper_test.rb b/test/unit/cms_helper_test.rb
index 0ac6b56..076a3ab 100644
--- a/test/unit/cms_helper_test.rb
+++ b/test/unit/cms_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CmsHelperTest < ActionView::TestCase
 
diff --git a/test/unit/colorbox_helper_test.rb b/test/unit/colorbox_helper_test.rb
index 0f260aa..ba2078d 100644
--- a/test/unit/colorbox_helper_test.rb
+++ b/test/unit/colorbox_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ColorboxHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/comment_handler_test.rb b/test/unit/comment_handler_test.rb
index 242c1f0..b3fa6f2 100644
--- a/test/unit/comment_handler_test.rb
+++ b/test/unit/comment_handler_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommentHandlerTest < ActiveSupport::TestCase
 
diff --git a/test/unit/comment_helper_test.rb b/test/unit/comment_helper_test.rb
index ab72afb..91c3200 100644
--- a/test/unit/comment_helper_test.rb
+++ b/test/unit/comment_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommentHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/comment_notifier_test.rb b/test/unit/comment_notifier_test.rb
index e03df70..00bf070 100644
--- a/test/unit/comment_notifier_test.rb
+++ b/test/unit/comment_notifier_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommentNotifierTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/comment_test.rb b/test/unit/comment_test.rb
index 4a0f5e1..bdaae6f 100644
--- a/test/unit/comment_test.rb
+++ b/test/unit/comment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommentTest < ActiveSupport::TestCase
 
diff --git a/test/unit/communities_block_test.rb b/test/unit/communities_block_test.rb
index 472199f..f00c0b5 100644
--- a/test/unit/communities_block_test.rb
+++ b/test/unit/communities_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommunitiesBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/community_test.rb b/test/unit/community_test.rb
index 6bbd078..8d96ce4 100644
--- a/test/unit/community_test.rb
+++ b/test/unit/community_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CommunityTest < ActiveSupport::TestCase
 
diff --git a/test/unit/contact_list_test.rb b/test/unit/contact_list_test.rb
index 344ea9e..1804db0 100644
--- a/test/unit/contact_list_test.rb
+++ b/test/unit/contact_list_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ContactListTest < ActiveSupport::TestCase
 
diff --git a/test/unit/contact_sender_test.rb b/test/unit/contact_sender_test.rb
index 5a4e059..6726837 100644
--- a/test/unit/contact_sender_test.rb
+++ b/test/unit/contact_sender_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ContactSenderTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/contact_test.rb b/test/unit/contact_test.rb
index 9c352dc..78cde6a 100644
--- a/test/unit/contact_test.rb
+++ b/test/unit/contact_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative "../test_helper"
 
 class ContactTest < ActiveSupport::TestCase
 
diff --git a/test/unit/content_viewer_helper_test.rb b/test/unit/content_viewer_helper_test.rb
index f1b0e65..6dbb90b 100644
--- a/test/unit/content_viewer_helper_test.rb
+++ b/test/unit/content_viewer_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ContentViewerHelperTest < ActionView::TestCase
 
diff --git a/test/unit/countries_helper_test.rb b/test/unit/countries_helper_test.rb
index 1cd3a9e..e53230c 100644
--- a/test/unit/countries_helper_test.rb
+++ b/test/unit/countries_helper_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CountriesHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/create_community_test.rb b/test/unit/create_community_test.rb
index 041e937..c1bf8ef 100644
--- a/test/unit/create_community_test.rb
+++ b/test/unit/create_community_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CreateCommunityTest < ActiveSupport::TestCase
 
diff --git a/test/unit/create_enterprise_test.rb b/test/unit/create_enterprise_test.rb
index 9a66d98..b028e04 100644
--- a/test/unit/create_enterprise_test.rb
+++ b/test/unit/create_enterprise_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CreateEnterpriseTest < ActiveSupport::TestCase
 
diff --git a/test/unit/create_thumbnails_job_test.rb b/test/unit/create_thumbnails_job_test.rb
index 4ea1934..10003da 100644
--- a/test/unit/create_thumbnails_job_test.rb
+++ b/test/unit/create_thumbnails_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class CreateThumbnailsJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/dates_helper_test.rb b/test/unit/dates_helper_test.rb
index 15990c9..5d2e91c 100644
--- a/test/unit/dates_helper_test.rb
+++ b/test/unit/dates_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DatesHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/disabled_enterprise_message_block_test.rb b/test/unit/disabled_enterprise_message_block_test.rb
index 5e78621..2e1ff28 100644
--- a/test/unit/disabled_enterprise_message_block_test.rb
+++ b/test/unit/disabled_enterprise_message_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DisabledEnterpriseMessageBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/display_helper_test.rb b/test/unit/display_helper_test.rb
index baf4ff9..4936280 100644
--- a/test/unit/display_helper_test.rb
+++ b/test/unit/display_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DisplayHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/doc_item_test.rb b/test/unit/doc_item_test.rb
index 893bc76..7fc641a 100644
--- a/test/unit/doc_item_test.rb
+++ b/test/unit/doc_item_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative "../test_helper"
 
 class DocItemTest < ActiveSupport::TestCase
 
diff --git a/test/unit/doc_section_test.rb b/test/unit/doc_section_test.rb
index 64e8303..9fb84a1 100644
--- a/test/unit/doc_section_test.rb
+++ b/test/unit/doc_section_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'test_helper'
+require_relative "../test_helper"
 
 class DocSectionTest < ActiveSupport::TestCase
 
diff --git a/test/unit/doc_topic_test.rb b/test/unit/doc_topic_test.rb
index e906387..a6ff04f 100644
--- a/test/unit/doc_topic_test.rb
+++ b/test/unit/doc_topic_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DocTopicTest < ActiveSupport::TestCase
   should 'be a DocItem' do
diff --git a/test/unit/domain_test.rb b/test/unit/domain_test.rb
index 63d56e6..455927f 100644
--- a/test/unit/domain_test.rb
+++ b/test/unit/domain_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class DomainTest < ActiveSupport::TestCase
   fixtures :domains, :environments, :profiles, :users
diff --git a/test/unit/email_activation_test.rb b/test/unit/email_activation_test.rb
index ef866a2..a77cf7f 100644
--- a/test/unit/email_activation_test.rb
+++ b/test/unit/email_activation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EmailActivationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/enterprise_activation_test.rb b/test/unit/enterprise_activation_test.rb
index eea8833..f860a3f 100644
--- a/test/unit/enterprise_activation_test.rb
+++ b/test/unit/enterprise_activation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnterpriseActivationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/enterprise_homepage_helper_test.rb b/test/unit/enterprise_homepage_helper_test.rb
index 8befef1..a1fe70a 100644
--- a/test/unit/enterprise_homepage_helper_test.rb
+++ b/test/unit/enterprise_homepage_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnterpriseHomepageHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/enterprise_homepage_test.rb b/test/unit/enterprise_homepage_test.rb
index f017540..3d5dd6a 100644
--- a/test/unit/enterprise_homepage_test.rb
+++ b/test/unit/enterprise_homepage_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnterpriseHomepageTest < ActiveSupport::TestCase
   
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index d258b8c..fd5bfb7 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnterpriseTest < ActiveSupport::TestCase
   fixtures :profiles, :environments, :users
diff --git a/test/unit/enterprises_block_test.rb b/test/unit/enterprises_block_test.rb
index a04d112..50b1b0e 100644
--- a/test/unit/enterprises_block_test.rb
+++ b/test/unit/enterprises_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnterprisesBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/environment_mailing_test.rb b/test/unit/environment_mailing_test.rb
index 78a090d..79285c6 100644
--- a/test/unit/environment_mailing_test.rb
+++ b/test/unit/environment_mailing_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnvironmentMailingTest < ActiveSupport::TestCase
 
diff --git a/test/unit/environment_test.rb b/test/unit/environment_test.rb
index 5442632..7513989 100644
--- a/test/unit/environment_test.rb
+++ b/test/unit/environment_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EnvironmentTest < ActiveSupport::TestCase
   fixtures :environments
diff --git a/test/unit/event_test.rb b/test/unit/event_test.rb
index cfd083c..1df629e 100644
--- a/test/unit/event_test.rb
+++ b/test/unit/event_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EventTest < ActiveSupport::TestCase
 
diff --git a/test/unit/events_helper_test.rb b/test/unit/events_helper_test.rb
index a979f41..9f935db 100644
--- a/test/unit/events_helper_test.rb
+++ b/test/unit/events_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class EventsHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/extended_tag_test.rb b/test/unit/extended_tag_test.rb
index 7311508..a4fec02 100644
--- a/test/unit/extended_tag_test.rb
+++ b/test/unit/extended_tag_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'extended_tag.rb'
 
 class UserTest < ActiveSupport::TestCase
diff --git a/test/unit/external_feed_test.rb b/test/unit/external_feed_test.rb
index 9aeebff..abcbce6 100644
--- a/test/unit/external_feed_test.rb
+++ b/test/unit/external_feed_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ExternalFeedTest < ActiveSupport::TestCase
 
diff --git a/test/unit/fans_block_test.rb b/test/unit/fans_block_test.rb
index 5871ba5..fb42e24 100644
--- a/test/unit/fans_block_test.rb
+++ b/test/unit/fans_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FansBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/favorite_enterprises_block_test.rb b/test/unit/favorite_enterprises_block_test.rb
index a8f92c1..8febf9f 100644
--- a/test/unit/favorite_enterprises_block_test.rb
+++ b/test/unit/favorite_enterprises_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FavoriteEnterprisesBlockTest < ActiveSupport::TestCase
   
diff --git a/test/unit/featured_products_block_test.rb b/test/unit/featured_products_block_test.rb
index ebb16e4..6f02ee7 100644
--- a/test/unit/featured_products_block_test.rb
+++ b/test/unit/featured_products_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FeaturedProductsBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/feed_handler_test.rb b/test/unit/feed_handler_test.rb
index 0990b3b..413ef2e 100644
--- a/test/unit/feed_handler_test.rb
+++ b/test/unit/feed_handler_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FeedHandlerTest < ActiveSupport::TestCase
 
diff --git a/test/unit/feed_reader_block_test.rb b/test/unit/feed_reader_block_test.rb
index a20ae01..bd14af5 100644
--- a/test/unit/feed_reader_block_test.rb
+++ b/test/unit/feed_reader_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FeedReaderBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/feed_updater_test.rb b/test/unit/feed_updater_test.rb
index 38bfb2d..6794751 100644
--- a/test/unit/feed_updater_test.rb
+++ b/test/unit/feed_updater_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FeedUpdaterTest < ActiveSupport::TestCase
 
diff --git a/test/unit/feed_writer_test.rb b/test/unit/feed_writer_test.rb
index 3cf027c..3e8457e 100644
--- a/test/unit/feed_writer_test.rb
+++ b/test/unit/feed_writer_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FeedWriterTest < ActiveSupport::TestCase
 
diff --git a/test/unit/file_presenter_test.rb b/test/unit/file_presenter_test.rb
index 917885f..89547f9 100644
--- a/test/unit/file_presenter_test.rb
+++ b/test/unit/file_presenter_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FilePresenterTest < ActiveSupport::TestCase
 
diff --git a/test/unit/folder_helper_test.rb b/test/unit/folder_helper_test.rb
index 31b3541..6f95471 100644
--- a/test/unit/folder_helper_test.rb
+++ b/test/unit/folder_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FolderHelperTest < ActionView::TestCase
 
diff --git a/test/unit/folder_test.rb b/test/unit/folder_test.rb
index 5a2d909..c2e9344 100644
--- a/test/unit/folder_test.rb
+++ b/test/unit/folder_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FolderTest < ActiveSupport::TestCase
 
diff --git a/test/unit/forgot_password_helper_test.rb b/test/unit/forgot_password_helper_test.rb
index 6f980cb..a8871b7 100644
--- a/test/unit/forgot_password_helper_test.rb
+++ b/test/unit/forgot_password_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ForgotPasswordHelperTest < ActionView::TestCase
   include ForgotPasswordHelper
diff --git a/test/unit/forms_helper_test.rb b/test/unit/forms_helper_test.rb
index 5f98e3f..c924690 100644
--- a/test/unit/forms_helper_test.rb
+++ b/test/unit/forms_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FormsHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/forum_helper_test.rb b/test/unit/forum_helper_test.rb
index 718b654..2fe3c0b 100644
--- a/test/unit/forum_helper_test.rb
+++ b/test/unit/forum_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ForumHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/forum_test.rb b/test/unit/forum_test.rb
index 879ab09..4f8f1dc 100644
--- a/test/unit/forum_test.rb
+++ b/test/unit/forum_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ForumTest < ActiveSupport::TestCase
 
diff --git a/test/unit/friendship_test.rb b/test/unit/friendship_test.rb
index 3470a51..8ab5729 100644
--- a/test/unit/friendship_test.rb
+++ b/test/unit/friendship_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class FriendshipTest < ActiveSupport::TestCase
 
diff --git a/test/unit/gallery_test.rb b/test/unit/gallery_test.rb
index 2c63b7a..928f550 100644
--- a/test/unit/gallery_test.rb
+++ b/test/unit/gallery_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class GalleryTest < ActiveSupport::TestCase
 
diff --git a/test/unit/get_email_contacts_job_test.rb b/test/unit/get_email_contacts_job_test.rb
index 202cb8b..7d64847 100644
--- a/test/unit/get_email_contacts_job_test.rb
+++ b/test/unit/get_email_contacts_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class GetEmailContactsJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/google_maps_test.rb b/test/unit/google_maps_test.rb
index 5029f06..ffa8f00 100644
--- a/test/unit/google_maps_test.rb
+++ b/test/unit/google_maps_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class GoogleMapsTest < ActiveSupport::TestCase
 
diff --git a/test/unit/gravatar_test.rb b/test/unit/gravatar_test.rb
index 1e6bf3c..e362d3a 100644
--- a/test/unit/gravatar_test.rb
+++ b/test/unit/gravatar_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class GravatarTest < ActiveSupport::TestCase
 
diff --git a/test/unit/highlights_block_test.rb b/test/unit/highlights_block_test.rb
index ba4a9ec..9987912 100644
--- a/test/unit/highlights_block_test.rb
+++ b/test/unit/highlights_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class HighlightsBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/image_test.rb b/test/unit/image_test.rb
index 40a6d2d..df721ad 100644
--- a/test/unit/image_test.rb
+++ b/test/unit/image_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ImageTest < ActiveSupport::TestCase
   fixtures :images
diff --git a/test/unit/input_test.rb b/test/unit/input_test.rb
index c3ce3cd..2caf05b 100644
--- a/test/unit/input_test.rb
+++ b/test/unit/input_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InputTest < ActiveSupport::TestCase
 
diff --git a/test/unit/integer_core_ext_test.rb b/test/unit/integer_core_ext_test.rb
index 5b308f1..7445673 100644
--- a/test/unit/integer_core_ext_test.rb
+++ b/test/unit/integer_core_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # tests for Integer core extension. See lib/noosfero/core_ext/integer.rb
 class IntegerCoreExtTest < ActiveSupport::TestCase
diff --git a/test/unit/invitation_job_test.rb b/test/unit/invitation_job_test.rb
index 0d091b6..7a1752c 100644
--- a/test/unit/invitation_job_test.rb
+++ b/test/unit/invitation_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InvitationJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/invitation_test.rb b/test/unit/invitation_test.rb
index 054fc2d..b4901a1 100644
--- a/test/unit/invitation_test.rb
+++ b/test/unit/invitation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InvitationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/invite_friend_test.rb b/test/unit/invite_friend_test.rb
index 74e9acd..3f68a28 100644
--- a/test/unit/invite_friend_test.rb
+++ b/test/unit/invite_friend_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InviteFriendTest < ActiveSupport::TestCase
 
diff --git a/test/unit/invite_member_test.rb b/test/unit/invite_member_test.rb
index 1fb63ba..c6533d5 100644
--- a/test/unit/invite_member_test.rb
+++ b/test/unit/invite_member_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class InviteMemberTest < ActiveSupport::TestCase
 
diff --git a/test/unit/language_helper_test.rb b/test/unit/language_helper_test.rb
index ae4b341..1d0291f 100644
--- a/test/unit/language_helper_test.rb
+++ b/test/unit/language_helper_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LanguageHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/layout_helper_test.rb b/test/unit/layout_helper_test.rb
index 4eedc67..ccfecde 100644
--- a/test/unit/layout_helper_test.rb
+++ b/test/unit/layout_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LayoutHelperTest < ActionView::TestCase
 
diff --git a/test/unit/layout_template_test.rb b/test/unit/layout_template_test.rb
index 0558ff4..8198975 100644
--- a/test/unit/layout_template_test.rb
+++ b/test/unit/layout_template_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LayoutTemplateTest < ActiveSupport::TestCase
 
diff --git a/test/unit/license_test.rb b/test/unit/license_test.rb
index ca624aa..ec1eb32 100644
--- a/test/unit/license_test.rb
+++ b/test/unit/license_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LicenseTest < ActiveSupport::TestCase
   should 'validate presence of name and environment' do
diff --git a/test/unit/lightbox_helper_test.rb b/test/unit/lightbox_helper_test.rb
index 4740a25..58889d1 100644
--- a/test/unit/lightbox_helper_test.rb
+++ b/test/unit/lightbox_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LightboxHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/link_list_block_test.rb b/test/unit/link_list_block_test.rb
index 796bcd2..73d069f 100644
--- a/test/unit/link_list_block_test.rb
+++ b/test/unit/link_list_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LinkListBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/load_config_test.rb b/test/unit/load_config_test.rb
index 856507c..a461425 100644
--- a/test/unit/load_config_test.rb
+++ b/test/unit/load_config_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LoadConfigTest < ActiveSupport::TestCase
 
diff --git a/test/unit/location_block_test.rb b/test/unit/location_block_test.rb
index abfeda2..cb9fb1e 100644
--- a/test/unit/location_block_test.rb
+++ b/test/unit/location_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LocationBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/login_block_test.rb b/test/unit/login_block_test.rb
index 71a9abe..77c1418 100644
--- a/test/unit/login_block_test.rb
+++ b/test/unit/login_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class LoginBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/macro_test.rb b/test/unit/macro_test.rb
index 19473b0..647f551 100644
--- a/test/unit/macro_test.rb
+++ b/test/unit/macro_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MacroTest < ActiveSupport::TestCase
 
diff --git a/test/unit/macros_helper_test.rb b/test/unit/macros_helper_test.rb
index 9f72b8a..926ed69 100644
--- a/test/unit/macros_helper_test.rb
+++ b/test/unit/macros_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MacrosHelperTest < ActionView::TestCase
   include MacrosHelper
diff --git a/test/unit/mail_conf_test.rb b/test/unit/mail_conf_test.rb
index 24e0f24..59d16b5 100644
--- a/test/unit/mail_conf_test.rb
+++ b/test/unit/mail_conf_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MailConfTest < ActiveSupport::TestCase
 
diff --git a/test/unit/mailing_job_test.rb b/test/unit/mailing_job_test.rb
index bbde0c1..3b9ed48 100644
--- a/test/unit/mailing_job_test.rb
+++ b/test/unit/mailing_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MailingJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/mailing_sent_test.rb b/test/unit/mailing_sent_test.rb
index 92f8470..238d008 100644
--- a/test/unit/mailing_sent_test.rb
+++ b/test/unit/mailing_sent_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MailingSentTest < ActiveSupport::TestCase
 
diff --git a/test/unit/mailing_test.rb b/test/unit/mailing_test.rb
index 60d9b21..5d7730e 100644
--- a/test/unit/mailing_test.rb
+++ b/test/unit/mailing_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MailingTest < ActiveSupport::TestCase
 
diff --git a/test/unit/main_block_test.rb b/test/unit/main_block_test.rb
index 8e2ca04..ce2c18d 100644
--- a/test/unit/main_block_test.rb
+++ b/test/unit/main_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MainBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/manage_products_helper_test.rb b/test/unit/manage_products_helper_test.rb
index 79ef8ba..c6af7d4 100644
--- a/test/unit/manage_products_helper_test.rb
+++ b/test/unit/manage_products_helper_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ManageProductsHelperTest < ActionView::TestCase
 
diff --git a/test/unit/moderate_user_registration_test.rb b/test/unit/moderate_user_registration_test.rb
index 0d8334c..0bf0887 100644
--- a/test/unit/moderate_user_registration_test.rb
+++ b/test/unit/moderate_user_registration_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ModerateUserRegistrationTest < ActiveSupport::TestCase
   fixtures :users, :environments
diff --git a/test/unit/multi_tenancy.rb b/test/unit/multi_tenancy.rb
index e68a4b6..3c89342 100644
--- a/test/unit/multi_tenancy.rb
+++ b/test/unit/multi_tenancy.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require 'noosfero/multi_tenancy'
 
 class MultiTenancyTest < ActiveSupport::TestCase
diff --git a/test/unit/my_network_block_test.rb b/test/unit/my_network_block_test.rb
index 1d17943..9e92647 100644
--- a/test/unit/my_network_block_test.rb
+++ b/test/unit/my_network_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class MyNetworkBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/national_region_test.rb b/test/unit/national_region_test.rb
index 3130481..e3484b4 100644
--- a/test/unit/national_region_test.rb
+++ b/test/unit/national_region_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class NationalRegionTest < ActiveSupport::TestCase
   
diff --git a/test/unit/noosfero_i18n_test.rb b/test/unit/noosfero_i18n_test.rb
index 63165f9..e6821f9 100644
--- a/test/unit/noosfero_i18n_test.rb
+++ b/test/unit/noosfero_i18n_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class NoosferoI18nTest < ActiveSupport::TestCase
 
diff --git a/test/unit/noosfero_test.rb b/test/unit/noosfero_test.rb
index b17eb9f..8669ef9 100644
--- a/test/unit/noosfero_test.rb
+++ b/test/unit/noosfero_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 require_dependency 'noosfero'
 
 class NoosferoTest < ActiveSupport::TestCase
diff --git a/test/unit/notify_activity_to_profiles_job_test.rb b/test/unit/notify_activity_to_profiles_job_test.rb
index b065082..08094d1 100644
--- a/test/unit/notify_activity_to_profiles_job_test.rb
+++ b/test/unit/notify_activity_to_profiles_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/organization_mailing_test.rb b/test/unit/organization_mailing_test.rb
index 257baaf..674b144 100644
--- a/test/unit/organization_mailing_test.rb
+++ b/test/unit/organization_mailing_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class OrganizationMailingTest < ActiveSupport::TestCase
 
diff --git a/test/unit/organization_test.rb b/test/unit/organization_test.rb
index d3d2cc3..a63aa62 100644
--- a/test/unit/organization_test.rb
+++ b/test/unit/organization_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class OrganizationTest < ActiveSupport::TestCase
   fixtures :profiles
diff --git a/test/unit/pending_task_notifier_test.rb b/test/unit/pending_task_notifier_test.rb
index 905f5a1..048f23c 100644
--- a/test/unit/pending_task_notifier_test.rb
+++ b/test/unit/pending_task_notifier_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PendingTaskNotifierTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/person_notifier_helper_test.rb b/test/unit/person_notifier_helper_test.rb
index 57394a7..9313202 100644
--- a/test/unit/person_notifier_helper_test.rb
+++ b/test/unit/person_notifier_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PersonNotifierHelperTest < ActionView::TestCase
 
diff --git a/test/unit/person_notifier_test.rb b/test/unit/person_notifier_test.rb
index 8495e72..152393d 100644
--- a/test/unit/person_notifier_test.rb
+++ b/test/unit/person_notifier_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PersonNotifierTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/person_test.rb b/test/unit/person_test.rb
index 61e153d..b2805dd 100644
--- a/test/unit/person_test.rb
+++ b/test/unit/person_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PersonTest < ActiveSupport::TestCase
   fixtures :profiles, :users, :environments
diff --git a/test/unit/plugin_hot_spot_test.rb b/test/unit/plugin_hot_spot_test.rb
index 62a8e8d..117d2bc 100644
--- a/test/unit/plugin_hot_spot_test.rb
+++ b/test/unit/plugin_hot_spot_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PluginHotSpotTest < ActiveSupport::TestCase
 
diff --git a/test/unit/plugin_manager_test.rb b/test/unit/plugin_manager_test.rb
index 6bd033d..dfeeb57 100644
--- a/test/unit/plugin_manager_test.rb
+++ b/test/unit/plugin_manager_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PluginManagerTest < ActiveSupport::TestCase
 
diff --git a/test/unit/plugin_settings_test.rb b/test/unit/plugin_settings_test.rb
index 0051cac..479bcc1 100644
--- a/test/unit/plugin_settings_test.rb
+++ b/test/unit/plugin_settings_test.rb
@@ -1,4 +1,4 @@
-require 'test_helper'
+require_relative "../test_helper"
 
 class SolarSystemPlugin < Noosfero::Plugin
   def self.secret_default_setting
diff --git a/test/unit/plugin_test.rb b/test/unit/plugin_test.rb
index 1db0350..f620c5a 100644
--- a/test/unit/plugin_test.rb
+++ b/test/unit/plugin_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PluginTest < ActiveSupport::TestCase
 
diff --git a/test/unit/posts_limit_test.rb b/test/unit/posts_limit_test.rb
index ed0a2e0..68a0a96 100644
--- a/test/unit/posts_limit_test.rb
+++ b/test/unit/posts_limit_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PostsLimitTest < ActiveSupport::TestCase
 
diff --git a/test/unit/price_detail_test.rb b/test/unit/price_detail_test.rb
index 192ee63..fdefef8 100644
--- a/test/unit/price_detail_test.rb
+++ b/test/unit/price_detail_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class PriceDetailTest < ActiveSupport::TestCase
 
diff --git a/test/unit/product_categories_block_test.rb b/test/unit/product_categories_block_test.rb
index 8083806..cc71da9 100644
--- a/test/unit/product_categories_block_test.rb
+++ b/test/unit/product_categories_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProductCategoriesBlockTest < ActiveSupport::TestCase
   should 'not be visible if products are disabled on the environment ' do
diff --git a/test/unit/product_category_test.rb b/test/unit/product_category_test.rb
index 59f9e58..e100971 100644
--- a/test/unit/product_category_test.rb
+++ b/test/unit/product_category_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProductCategoryTest < ActiveSupport::TestCase
 
diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb
index 6198ccf..ab8fde7 100644
--- a/test/unit/product_test.rb
+++ b/test/unit/product_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProductTest < ActiveSupport::TestCase
 
diff --git a/test/unit/production_cost_test.rb b/test/unit/production_cost_test.rb
index 8f88ca7..591b731 100644
--- a/test/unit/production_cost_test.rb
+++ b/test/unit/production_cost_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProductionCostTest < ActiveSupport::TestCase
 
diff --git a/test/unit/products_block_test.rb b/test/unit/products_block_test.rb
index 175b93b..a63ed2f 100644
--- a/test/unit/products_block_test.rb
+++ b/test/unit/products_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProductsBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_categorization_test.rb b/test/unit/profile_categorization_test.rb
index 9f3309c..9a5b3d4 100644
--- a/test/unit/profile_categorization_test.rb
+++ b/test/unit/profile_categorization_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileCategorizationTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_helper_test.rb b/test/unit/profile_helper_test.rb
index 4ab943e..c59eb79 100644
--- a/test/unit/profile_helper_test.rb
+++ b/test/unit/profile_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_image_block_test.rb b/test/unit/profile_image_block_test.rb
index ad8f175..787065c 100644
--- a/test/unit/profile_image_block_test.rb
+++ b/test/unit/profile_image_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileImageBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_info_block_test.rb b/test/unit/profile_info_block_test.rb
index 3424c62..9e52da0 100644
--- a/test/unit/profile_info_block_test.rb
+++ b/test/unit/profile_info_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileInfoBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_list_block_test.rb b/test/unit/profile_list_block_test.rb
index 600ba61..2f5b3f8 100644
--- a/test/unit/profile_list_block_test.rb
+++ b/test/unit/profile_list_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileListBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_search_block_test.rb b/test/unit/profile_search_block_test.rb
index a520450..f2ceccd 100644
--- a/test/unit/profile_search_block_test.rb
+++ b/test/unit/profile_search_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileSearchBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/profile_test.rb b/test/unit/profile_test.rb
index f6e2790..ad58921 100644
--- a/test/unit/profile_test.rb
+++ b/test/unit/profile_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ProfileTest < ActiveSupport::TestCase
   fixtures :profiles, :environments, :users, :roles, :domains
diff --git a/test/unit/qualifier_certifier_test.rb b/test/unit/qualifier_certifier_test.rb
index 513e703..7baa85f 100644
--- a/test/unit/qualifier_certifier_test.rb
+++ b/test/unit/qualifier_certifier_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class QualifierCertifierTest < ActiveSupport::TestCase
 
diff --git a/test/unit/qualifier_test.rb b/test/unit/qualifier_test.rb
index 4591658..7a9b373 100644
--- a/test/unit/qualifier_test.rb
+++ b/test/unit/qualifier_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class QualifierTest < ActiveSupport::TestCase
 
diff --git a/test/unit/raw_html_article_test.rb b/test/unit/raw_html_article_test.rb
index 577e544..2748849 100644
--- a/test/unit/raw_html_article_test.rb
+++ b/test/unit/raw_html_article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RawHTMLArticleTest < ActiveSupport::TestCase
 
diff --git a/test/unit/raw_html_block_test.rb b/test/unit/raw_html_block_test.rb
index e2be8d6..bdf925f 100644
--- a/test/unit/raw_html_block_test.rb
+++ b/test/unit/raw_html_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RawHTMLBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/recent_documents_block_test.rb b/test/unit/recent_documents_block_test.rb
index 78cc86b..c96366d 100644
--- a/test/unit/recent_documents_block_test.rb
+++ b/test/unit/recent_documents_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RecentDocumentsBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/region_test.rb b/test/unit/region_test.rb
index 477782b..8e08a81 100644
--- a/test/unit/region_test.rb
+++ b/test/unit/region_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RegionTest < ActiveSupport::TestCase
 
diff --git a/test/unit/role_assignment_ext_test.rb b/test/unit/role_assignment_ext_test.rb
index 0fc21ed..8d6d150 100644
--- a/test/unit/role_assignment_ext_test.rb
+++ b/test/unit/role_assignment_ext_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RoleAssignmentExtTest < ActiveSupport::TestCase
   should 'increase organization members_count only on the first role_assignment' do
diff --git a/test/unit/rss_feed_test.rb b/test/unit/rss_feed_test.rb
index 746ea30..e8079b9 100644
--- a/test/unit/rss_feed_test.rb
+++ b/test/unit/rss_feed_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class RssFeedTest < ActiveSupport::TestCase
 
diff --git a/test/unit/scope_tool.rb b/test/unit/scope_tool.rb
index 8a91c54..c64c548 100644
--- a/test/unit/scope_tool.rb
+++ b/test/unit/scope_tool.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ScopeToolTest < ActiveSupport::TestCase
   include ScopeTool
diff --git a/test/unit/scrap_notifier_test.rb b/test/unit/scrap_notifier_test.rb
index a44ccf6..a6c8070 100644
--- a/test/unit/scrap_notifier_test.rb
+++ b/test/unit/scrap_notifier_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ScrapNotifierTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/scrap_test.rb b/test/unit/scrap_test.rb
index 14f46f1..a258b2e 100644
--- a/test/unit/scrap_test.rb
+++ b/test/unit/scrap_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require_relative "../test_helper"
 
 class ScrapTest < ActiveSupport::TestCase
 
diff --git a/test/unit/search_helper_test.rb b/test/unit/search_helper_test.rb
index 1095225..88a1922 100644
--- a/test/unit/search_helper_test.rb
+++ b/test/unit/search_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SearchHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/sellers_search_block_test.rb b/test/unit/sellers_search_block_test.rb
index 7776074..1e2501f 100644
--- a/test/unit/sellers_search_block_test.rb
+++ b/test/unit/sellers_search_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SellersSearchBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/set_profile_region_from_city_state_test.rb b/test/unit/set_profile_region_from_city_state_test.rb
index 4c3c2aa..7da524e 100644
--- a/test/unit/set_profile_region_from_city_state_test.rb
+++ b/test/unit/set_profile_region_from_city_state_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SetProfileRegionFromCityStateTest < ActiveSupport::TestCase
 
diff --git a/test/unit/short_filename_test.rb b/test/unit/short_filename_test.rb
index 6a6d9e7..97f011b 100644
--- a/test/unit/short_filename_test.rb
+++ b/test/unit/short_filename_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class NoosferoFilenamesTest < ActiveSupport::TestCase
 
diff --git a/test/unit/slideshow_block_test.rb b/test/unit/slideshow_block_test.rb
index b8f3d39..b34ea77 100644
--- a/test/unit/slideshow_block_test.rb
+++ b/test/unit/slideshow_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SlideshowBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/slug_test.rb b/test/unit/slug_test.rb
index 2a7b090..4086399 100644
--- a/test/unit/slug_test.rb
+++ b/test/unit/slug_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # tests for String#to_slug core extension. See lib/noosfero/core_ext/string.rb
 class SlugTest < ActiveSupport::TestCase
diff --git a/test/unit/spammer_logger_test.rb b/test/unit/spammer_logger_test.rb
index b6ca2af..69155bf 100644
--- a/test/unit/spammer_logger_test.rb
+++ b/test/unit/spammer_logger_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SpammerLoggerTest < ActiveSupport::TestCase
   should 'log the spammer ip' do
diff --git a/test/unit/sqlite_extension_test.rb b/test/unit/sqlite_extension_test.rb
index 26f0779..dabd639 100644
--- a/test/unit/sqlite_extension_test.rb
+++ b/test/unit/sqlite_extension_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # if this test is run without SQLite (e.g. with mysql or postgres), the tests
 # will just pass. The idea is to test our local extensions to SQLite.
diff --git a/test/unit/state_test.rb b/test/unit/state_test.rb
index ba8eae6..15fe358 100644
--- a/test/unit/state_test.rb
+++ b/test/unit/state_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class StateTest < ActiveSupport::TestCase
   # Replace this with your real tests.
diff --git a/test/unit/string_core_ext_test.rb b/test/unit/string_core_ext_test.rb
index ee78aea..a1c7396 100644
--- a/test/unit/string_core_ext_test.rb
+++ b/test/unit/string_core_ext_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 # tests for String core extension. See lib/noosfero/core_ext/string.rb
 class StringCoreExtTest < ActiveSupport::TestCase
diff --git a/test/unit/suggest_article_test.rb b/test/unit/suggest_article_test.rb
index caf0414..acfab41 100644
--- a/test/unit/suggest_article_test.rb
+++ b/test/unit/suggest_article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class SuggestArticleTest < ActiveSupport::TestCase
 
diff --git a/test/unit/tags_block_test.rb b/test/unit/tags_block_test.rb
index eb28f7e..1d6e204 100644
--- a/test/unit/tags_block_test.rb
+++ b/test/unit/tags_block_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TagsBlockTest < ActiveSupport::TestCase
 
diff --git a/test/unit/tags_helper_test.rb b/test/unit/tags_helper_test.rb
index 89c20cb..7106da9 100644
--- a/test/unit/tags_helper_test.rb
+++ b/test/unit/tags_helper_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TagsHelperTest < ActiveSupport::TestCase
 
diff --git a/test/unit/task_mailer_test.rb b/test/unit/task_mailer_test.rb
index 46d7dcc..4286565 100644
--- a/test/unit/task_mailer_test.rb
+++ b/test/unit/task_mailer_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TaskMailerTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/task_test.rb b/test/unit/task_test.rb
index 1166e9c..18b2bf9 100644
--- a/test/unit/task_test.rb
+++ b/test/unit/task_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TaskTest < ActiveSupport::TestCase
 
diff --git a/test/unit/text_article_test.rb b/test/unit/text_article_test.rb
index 77a5535..1ec97ed 100644
--- a/test/unit/text_article_test.rb
+++ b/test/unit/text_article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TextArticleTest < ActiveSupport::TestCase
   
diff --git a/test/unit/textile_article_test.rb b/test/unit/textile_article_test.rb
index e41ee9a..86fc884 100644
--- a/test/unit/textile_article_test.rb
+++ b/test/unit/textile_article_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TextileArticleTest < ActiveSupport::TestCase
   
diff --git a/test/unit/theme_test.rb b/test/unit/theme_test.rb
index da33b62..04eee41 100644
--- a/test/unit/theme_test.rb
+++ b/test/unit/theme_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ThemeTest < ActiveSupport::TestCase
 
diff --git a/test/unit/thickbox_helper_test.rb b/test/unit/thickbox_helper_test.rb
index d5e7720..501cea0 100644
--- a/test/unit/thickbox_helper_test.rb
+++ b/test/unit/thickbox_helper_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ThickboxHelperTest < ActiveSupport::TestCase
   include ThickboxHelper
diff --git a/test/unit/thumbnail_test.rb b/test/unit/thumbnail_test.rb
index 6369ee4..29c4818 100644
--- a/test/unit/thumbnail_test.rb
+++ b/test/unit/thumbnail_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ThumbnailTest < ActiveSupport::TestCase
 
diff --git a/test/unit/ticket_test.rb b/test/unit/ticket_test.rb
index d4812a4..e362530 100644
--- a/test/unit/ticket_test.rb
+++ b/test/unit/ticket_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TicketTest < ActiveSupport::TestCase
 
diff --git a/test/unit/tiny_mce_article_test.rb b/test/unit/tiny_mce_article_test.rb
index ee3ace4..b7c3152 100644
--- a/test/unit/tiny_mce_article_test.rb
+++ b/test/unit/tiny_mce_article_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TinyMceArticleTest < ActiveSupport::TestCase
 
diff --git a/test/unit/translatable_content_test.rb b/test/unit/translatable_content_test.rb
index 6f59e5a..ba5daca 100644
--- a/test/unit/translatable_content_test.rb
+++ b/test/unit/translatable_content_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class TranslatableContentTest < ActiveSupport::TestCase
 
diff --git a/test/unit/unit_test.rb b/test/unit/unit_test.rb
index bdadc70..0a11474 100644
--- a/test/unit/unit_test.rb
+++ b/test/unit/unit_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class UnitTest < ActiveSupport::TestCase
 
diff --git a/test/unit/uploaded_file_test.rb b/test/unit/uploaded_file_test.rb
index d9769a2..b7e7526 100644
--- a/test/unit/uploaded_file_test.rb
+++ b/test/unit/uploaded_file_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class UploadedFileTest < ActiveSupport::TestCase
 
diff --git a/test/unit/user_activation_job_test.rb b/test/unit/user_activation_job_test.rb
index 8c3775c..d4242fa 100644
--- a/test/unit/user_activation_job_test.rb
+++ b/test/unit/user_activation_job_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class NotifyActivityToProfilesJobTest < ActiveSupport::TestCase
 
diff --git a/test/unit/user_mailer_test.rb b/test/unit/user_mailer_test.rb
index 556ff25..eca5a52 100644
--- a/test/unit/user_mailer_test.rb
+++ b/test/unit/user_mailer_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class UserMailerTest < ActiveSupport::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 3adaf32..22aceac 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class UserTest < ActiveSupport::TestCase
   # Be sure to include AuthenticatedTestHelper in test/test_helper.rb instead.
diff --git a/test/unit/validation_info_test.rb b/test/unit/validation_info_test.rb
index 73c9e6d..3419a59 100644
--- a/test/unit/validation_info_test.rb
+++ b/test/unit/validation_info_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class ValidationInfoTest < ActiveSupport::TestCase
 
diff --git a/test/unit/white_list_filter_test.rb b/test/unit/white_list_filter_test.rb
index 27d6d29..798a5ab 100644
--- a/test/unit/white_list_filter_test.rb
+++ b/test/unit/white_list_filter_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require_relative "../test_helper"
 
 class WhiteListFilterTest < ActiveSupport::TestCase
 
--
libgit2 0.21.2