diff --git a/Gemfile b/Gemfile
index 535e29aaa..e6181298a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ gem "rails", "2.3.14"
 gem "i18n", "~> 0.4.2"
 gem "coderay", "~> 1.0.0"
 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
+gem "tzinfo", "~> 0.3.31"
 
 # Optional gem for LDAP authentication
 group :ldap do
diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index 01c32b5d2..aeb900f87 100644
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -60,6 +60,15 @@ class Redmine::I18nTest < ActiveSupport::TestCase
     end
   end
 
+  def test_time_for_each_zone
+    ActiveSupport::TimeZone.all.each do |zone|
+      User.current.stubs(:time_zone).returns(zone.name)
+      assert_nothing_raised "#{zone} failure" do
+        format_time(Time.now)
+      end
+    end
+  end
+
   def test_time_format
     set_language_if_valid 'en'
     now = Time.parse('2011-02-20 15:45:22')