diff --git a/Gemfile.lock b/Gemfile.lock
index 42814099098..832d5047363 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -194,7 +194,12 @@ GEM
       addressable
     daemons (1.4.0)
     dalli (2.7.11)
-    database_cleaner (1.99.0)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
     ddtrace (0.49.0)
       ffi (~> 1.0)
       msgpack
diff --git a/spec/lib/open_food_network/i18n_config_spec.rb b/spec/lib/open_food_network/i18n_config_spec.rb
index 198c0c0cdca..b69aa8b745f 100644
--- a/spec/lib/open_food_network/i18n_config_spec.rb
+++ b/spec/lib/open_food_network/i18n_config_spec.rb
@@ -5,6 +5,11 @@
 
 module OpenFoodNetwork
   describe I18nConfig do
+    before do
+      # Allow non-stubbed calls to ENV to proceed
+      allow(ENV).to receive(:[]).and_call_original
+    end
+
     context "in default test configuration" do
       before do
         allow(ENV).to receive(:[]).with("LOCALE").and_return("en")