diff --git a/rubygem-i18n.spec b/rubygem-i18n.spec
index 5ee0d41..9a94d50 100644
--- a/rubygem-i18n.spec
+++ b/rubygem-i18n.spec
@@ -3,8 +3,8 @@
 %bcond_without tests
 
 Name: rubygem-%{gem_name}
-Version: 1.8.7
-Release: 4%{?dist}
+Version: 1.8.11
+Release: 1%{?dist}
 Summary: New wave Internationalization support for Ruby
 # `BSD or Ruby` due to header of lib/i18n/gettext/po_parser.rb
 License: MIT and (BSD or Ruby)
@@ -12,7 +12,7 @@ URL: https://github.com/ruby-i18n/i18n
 Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
 # Since 1.8.2 tests are not shipped with the gem, but can be checked like
 # git clone --no-checkout https://github.com/ruby-i18n/i18n
-# cd i18n && git archive -v -o i18n-1.8.7-tests.txz v1.8.7 test
+# cd i18n && git archive -v -o i18n-1.8.11-tests.txz v1.8.11 test
 Source1: %{gem_name}-%{version}-tests.txz
 BuildRequires: ruby
 BuildRequires: ruby(release)
@@ -58,9 +58,15 @@ ln -s %{_builddir}/test .
 # Bundler just complicates everything in our case, remove it.
 sed -i -e "/require 'bundler\/setup'/ s/^/#/" test/test_helper.rb
 
+# Mocha needs to be required differently
+# TODO: PR @ https://github.com/ruby-i18n/i18n/edit/master/test/test_helper.rb#L16
+sed -i 's/\(require .mocha\/\)setup/\1minitest/' test/test_helper.rb
+
 # Tests are failing without LANG environment is set.
 # https://github.com/svenfuchs/i18n/issues/115
-LANG=C.utf8 ruby -Ilib:test -e 'Dir.glob "./test/**/*_test.rb", &method(:require)'
+LANG=C.utf8 \
+find ./test/ -type f -name '*_test.rb' -exec \
+  ruby -Ilib:test '{}' \;
 popd
 %endif
 
@@ -76,6 +82,10 @@ popd
 %doc %{gem_instdir}/README.md
 
 %changelog
+* Tue Jan 25 2022 Pavel Valena <pvalena@redhat.com> - 1.8.11-1
+- Update to i18n 1.8.11.
+  Resolves: rhbz#1923812
+
 * Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 84b9ca3..0630b06 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (i18n-1.8.7.gem) = 7ba13116467a6d45ed6e05a6ea73d0c05127d16652baf4f448e11011bf53227214bdc36d345f5fe57f2a63d1281e66171ec30e89782be5722cb9f06a75c76385
-SHA512 (i18n-1.8.7-tests.txz) = 4e353f231373b58764004b5699c2c20625dd259effaff5505fd83928363c479f9f7ede45f28020af965eb49bfea70400b897512afbd4f534b79408873e21f20b
+SHA512 (i18n-1.8.11.gem) = c944467f5c673fbd8f4292bdfcea3d12262f6a5e29307565830c3fa3d57a07009555c422ddf0cf5fefc9d83851b9c4e8204e8f72ae36f4d9b17f970da858098e
+SHA512 (i18n-1.8.11-tests.txz) = 7ae1d1770a63c8670397e94931fe6173489807cb2fe4f6fa922262218bccce1bab4e878b54e933e97c181abc2c71255d788f21903070ed268969b15153ae39df