diff --git a/config/initializers/deprecations.rb b/config/initializers/deprecations.rb
index f3f47b2ccf0301f42354e604b331c16422f2dad9..2476ea9e38a6dcece714b408a6f21a31681d6f25 100644
--- a/config/initializers/deprecations.rb
+++ b/config/initializers/deprecations.rb
@@ -1,5 +1,5 @@
 deprecator = ActiveSupport::Deprecation.new('11.0', 'GitLab')
 
-if Gitlab.com? || Rails.env.development?
+if Gitlab.dev_env_or_com?
   ActiveSupport::Deprecation.deprecate_methods(Gitlab::GitalyClient::StorageSettings, :legacy_disk_path, deprecator: deprecator)
 end
diff --git a/lib/gitlab.rb b/lib/gitlab.rb
index 0a167104bf476a0641a09d422645de3b38fb3680..a759aa7da88a9cae6be54a76a7936fbb5bcd579b 100644
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -30,6 +30,6 @@ module Gitlab
   end
 
   def self.dev_env_or_com?
-    Rails.env.test? || Rails.env.development? || org? || com?
+    Rails.env.development? || org? || com?
   end
 end