diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 720658115282556e43af3379f0c43dd79f2ee726..9a5f4f598b2c8406e6009bc45ecdfe578e61b45a 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -23,8 +23,7 @@ module Gitlab
           klass = Gitaly.const_get(name.to_s.camelcase.to_sym).const_get(:Stub)
           addr = address(storage)
           addr = addr.sub(%r{^tcp://}, '') if URI(addr).scheme == 'tcp'
-          timeout = 10 if Rails.env.test?
-          klass.new(addr, :this_channel_is_insecure, timeout: timeout)
+          klass.new(addr, :this_channel_is_insecure)
         end
       end
     end