diff --git a/app/lib/middleware/time_zone_setter.rb b/app/lib/middleware/time_zone_setter.rb
deleted file mode 100644
index 0f308cbcd..000000000
--- a/app/lib/middleware/time_zone_setter.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-module Middleware
-  class TimeZoneSetter
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      Time.zone = ActiveSupport::TimeZone.new(ENV["TZ"]) if ENV["TZ"]
-
-      @app.call(env)
-    end
-  end
-end
diff --git a/app/middlewares/set_time_zone.rb b/app/middlewares/set_time_zone.rb
new file mode 100644
index 000000000..e1f507e26
--- /dev/null
+++ b/app/middlewares/set_time_zone.rb
@@ -0,0 +1,12 @@
+# NOTE: this middleware is only for test mode
+class SetTimeZone
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    Time.zone = ActiveSupport::TimeZone.new(ENV["TZ"]) if ENV["TZ"]
+
+    @app.call(env)
+  end
+end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 4a9300272..3ac0d40cf 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -4,7 +4,7 @@ Rails.application.configure do
 
   # Include middleware to ensure timezone for browser requests for Capybara specs
   # matches the random zonebie timezone set at the beginning of our spec run
-  config.middleware.use(Middleware::TimeZoneSetter)
+  config.middleware.use SetTimeZone
 
   # The test environment is used exclusively to run your application's
   # test suite. You never need to work with it otherwise. Remember that