diff --git a/lib/gitlab/setup_helper.rb b/lib/gitlab/setup_helper.rb
index 48f204e0b86318530237ef97b4a3d063d5594d46..0cf82acb16d5123c9837e882053bc3f3b505c33a 100644
--- a/lib/gitlab/setup_helper.rb
+++ b/lib/gitlab/setup_helper.rb
@@ -121,7 +121,7 @@ def configuration_toml(gitaly_dir, storage_paths, options, gitaly_ruby: true)
 
           config[:'gitaly-ruby'] = { dir: File.join(gitaly_dir, 'ruby') } if gitaly_ruby
           config[:'gitlab-shell'] = { dir: Gitlab.config.gitlab_shell.path }
-          config[:bin_dir] = Gitlab.config.gitaly.client_path
+          config[:bin_dir] = File.expand_path(Gitlab.config.gitaly.client_path)
           config[:gitlab] = { url: Gitlab.config.gitlab.url }
           config[:logging] = { dir: Rails.root.join('log').to_s }
 
diff --git a/spec/support/helpers/test_env.rb b/spec/support/helpers/test_env.rb
index cb25f5f9429318e56930782c432b0f9812e89e62..5edc6347716923bd22742dbeb5b6fdee43c7651f 100644
--- a/spec/support/helpers/test_env.rb
+++ b/spec/support/helpers/test_env.rb
@@ -184,7 +184,7 @@ def gitaly_socket_path
   end
 
   def gitaly_dir
-    File.dirname(gitaly_socket_path)
+    File.dirname(File.expand_path(gitaly_socket_path))
   end
 
   def start_gitaly(gitaly_dir)