diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb
index b1d7f7ad7..ab6e09887 100644
--- a/test/unit/custom_field_test.rb
+++ b/test/unit/custom_field_test.rb
@@ -22,6 +22,10 @@ class CustomFieldTest < ActiveSupport::TestCase
            :trackers, :issue_statuses,
            :issues
 
+  def setup
+    User.current = nil
+  end
+
   def test_create
     field = UserCustomField.new(:name => 'Money money money', :field_format => 'float')
     assert field.save