diff --git a/lib/tasks/gitlab/gitaly.rake b/lib/tasks/gitlab/gitaly.rake
index a8db5701d0b95dc05adc1e67ab173b066dd16138..9df07ea8d83bc6428df302db948e5ce9c0389212 100644
--- a/lib/tasks/gitlab/gitaly.rake
+++ b/lib/tasks/gitlab/gitaly.rake
@@ -19,7 +19,7 @@ namespace :gitlab do
 
       Dir.chdir(args.dir) do
         create_gitaly_configuration
-        run_command!([command])
+        Bundler.with_original_env { run_command!([command]) }
       end
     end
 
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 7682bdf8cd0832b5713bc32744812a3e4795a937..86f9568c12e84d7e042da7f34b1d29fe034d461c 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -147,7 +147,7 @@ module TestEnv
     gitaly_exec = File.join(gitaly_dir, 'gitaly')
     gitaly_config = File.join(gitaly_dir, 'config.toml')
     log_file = Rails.root.join('log/gitaly-test.log').to_s
-    @gitaly_pid = spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file)
+    @gitaly_pid = Bundler.with_original_env { spawn(gitaly_exec, gitaly_config, [:out, :err] => log_file) }
   end
 
   def stop_gitaly