diff --git a/lib/bundler.rb b/lib/bundler.rb
index b20179934a..658dda3871 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -550,7 +550,7 @@ EOF
 
     def git_present?
       return @git_present if defined?(@git_present)
-      @git_present = Bundler.which("git") || Bundler.which("git.exe")
+      @git_present = Bundler.which("git#{RbConfig::CONFIG["EXEEXT"]}")
     end
 
     def feature_flag
diff --git a/test/rubygems/helper.rb b/test/rubygems/helper.rb
index 8d94f82d8e..45a5a14251 100644
--- a/test/rubygems/helper.rb
+++ b/test/rubygems/helper.rb
@@ -337,7 +337,7 @@ class Gem::TestCase < Test::Unit::TestCase
       ruby
     end
 
-    @git = ENV["GIT"] || (win_platform? ? "git.exe" : "git")
+    @git = ENV["GIT"] || "git#{RbConfig::CONFIG['EXEEXT']}"
 
     Gem.ensure_gem_subdirectories @gemhome
     Gem.ensure_default_gem_subdirectories @gemhome
@@ -1263,7 +1263,7 @@ Also, a list:
     ruby = ENV["RUBY"]
     return ruby if ruby
     ruby = "ruby"
-    rubyexe = "#{ruby}.exe"
+    rubyexe = "#{ruby}#{RbConfig::CONFIG['EXEEXT']}"
 
     3.times do
       if File.exist?(ruby) && File.executable?(ruby) && !File.directory?(ruby)