diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1ab7e9e..11bd52c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -278,7 +278,10 @@ module Redmine
   end
 
   class HelperTest < ActionView::TestCase
-    
+    def setup
+      super
+      User.current = nil
+    end
   end
 
   class ControllerTest < ActionController::TestCase
diff --git a/test/unit/helpers/activities_helper_test.rb b/test/unit/helpers/activities_helper_test.rb
index 2a31d14..a7df3c6 100644
--- a/test/unit/helpers/activities_helper_test.rb
+++ b/test/unit/helpers/activities_helper_test.rb
@@ -38,6 +38,7 @@ class ActivitiesHelperTest < Redmine::HelperTest
   end
 
   def setup
+    super
     MockEvent.clear
   end
 
diff --git a/test/unit/helpers/issues_helper_test.rb b/test/unit/helpers/issues_helper_test.rb
index 514d831..d618470 100644
--- a/test/unit/helpers/issues_helper_test.rb
+++ b/test/unit/helpers/issues_helper_test.rb
@@ -38,7 +38,6 @@ class IssuesHelperTest < Redmine::HelperTest
   def setup
     super
     set_language_if_valid('en')
-    User.current = nil
   end
 
   def test_issue_heading
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
index c72efff..2e87414 100644
--- a/test/unit/helpers/projects_helper_test.rb
+++ b/test/unit/helpers/projects_helper_test.rb
@@ -36,7 +36,6 @@ class ProjectsHelperTest < Redmine::HelperTest
   def setup
     super
     set_language_if_valid('en')
-    User.current = nil
   end
 
   def test_link_to_version_within_project
diff --git a/test/unit/helpers/sort_helper_test.rb b/test/unit/helpers/sort_helper_test.rb
index 605fd99..3aedcca 100644
--- a/test/unit/helpers/sort_helper_test.rb
+++ b/test/unit/helpers/sort_helper_test.rb
@@ -23,6 +23,7 @@ class SortHelperTest < Redmine::HelperTest
   include ERB::Util
 
   def setup
+    super
     @session = nil
     @sort_param = nil
   end
diff --git a/test/unit/helpers/timelog_helper_test.rb b/test/unit/helpers/timelog_helper_test.rb
index cec1e2c..ad04b99 100644
--- a/test/unit/helpers/timelog_helper_test.rb
+++ b/test/unit/helpers/timelog_helper_test.rb
@@ -32,10 +32,6 @@ class TimelogHelperTest < Redmine::HelperTest
                       :attachments,
                       :enumerations
 
-  def setup
-    super
-  end
-
   def test_activities_collection_for_select_options_should_return_array_of_activity_names_and_ids
     activities = activity_collection_for_select_options
     assert activities.include?(["Design", 9])
diff --git a/test/unit/helpers/watchers_helper_test.rb b/test/unit/helpers/watchers_helper_test.rb
index 9e46f64..2dccfa1 100644
--- a/test/unit/helpers/watchers_helper_test.rb
+++ b/test/unit/helpers/watchers_helper_test.rb
@@ -27,7 +27,6 @@ class WatchersHelperTest < Redmine::HelperTest
   def setup
     super
     set_language_if_valid('en')
-    User.current = nil
   end
 
   test '#watcher_link with a non-watched object' do