diff --git a/test/test_helper.rb b/test/test_helper.rb
index 925b42ee..e67b7576 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -15,4 +15,14 @@ class ActiveSupport::TestCase
     t.rewind
     t
   end
+
+  setup :reset_thread_variables
+
+  private
+
+  def reset_thread_variables
+    %w(danbooru-user danbooru-user_id).each do |x|
+      Thread.current[x] = nil
+    end
+  end
 end