diff --git a/lib/bundler/self_manager.rb b/lib/bundler/self_manager.rb
index 2aeac6be52..1d876075ec 100644
--- a/lib/bundler/self_manager.rb
+++ b/lib/bundler/self_manager.rb
@@ -182,7 +182,7 @@ module Bundler
     end
 
     def current_version
-      @current_version ||= Gem::Version.new(Bundler::VERSION)
+      @current_version ||= Bundler.gem_version
     end
 
     def lockfile_version
diff --git a/spec/bundler/commands/post_bundle_message_spec.rb b/spec/bundler/commands/post_bundle_message_spec.rb
index 8671504b25..7b5ac1aec9 100644
--- a/spec/bundler/commands/post_bundle_message_spec.rb
+++ b/spec/bundler/commands/post_bundle_message_spec.rb
@@ -19,7 +19,7 @@ RSpec.describe "post bundle message" do
   let(:bundle_complete_message)    { "Bundle complete!" }
   let(:bundle_updated_message)     { "Bundle updated!" }
   let(:installed_gems_stats)       { "4 Gemfile dependencies, 5 gems now installed." }
-  let(:bundle_show_message)        { Bundler::VERSION.split(".").first.to_i < 3 ? bundle_show_system_message : bundle_show_path_message }
+  let(:bundle_show_message)        { Bundler.bundler_major_version < 3 ? bundle_show_system_message : bundle_show_path_message }
 
   describe "for fresh bundle install" do
     it "shows proper messages according to the configured groups" do