diff --git a/gems/sorbet/lib/gem-generator-tracepoint/tracepoint_serializer.rb b/gems/sorbet/lib/gem-generator-tracepoint/tracepoint_serializer.rb
index d6be6484b7b..fe75b5c1d71 100644
--- a/gems/sorbet/lib/gem-generator-tracepoint/tracepoint_serializer.rb
+++ b/gems/sorbet/lib/gem-generator-tracepoint/tracepoint_serializer.rb
@@ -38,7 +38,9 @@ def initialize(files:, delegate_classes:)
       def serialize(output_dir)
         gem_class_defs = preprocess(@files)
 
-        FileUtils.mkdir_p(output_dir)
+        if !gem_class_defs.empty?
+          FileUtils.mkdir_p(output_dir)
+        end
 
         gem_class_defs.each do |gem, klass_ids|
           File.open("#{File.join(output_dir, gem[:gem])}.rbi", 'w') do |f|
@@ -102,6 +104,10 @@ def files_to_gem_class_defs(files)
             next
           end
           next if gem[:gem] == 'ruby'
+          # We're currently ignoring bundler, because we can't easily pin
+          # everyone to the same version of bundler in tests and in CI.
+          # There is an RBI for bundler in sorbet-typed.
+          next if gem[:gem] == 'bundler'
 
           gem_class_defs[gem] ||= {}
           defined.each do |item|
diff --git a/gems/sorbet/test/snapshot/total/empty/expected/sorbet/rbi/gems/bundler.rbi b/gems/sorbet/test/snapshot/total/empty/expected/sorbet/rbi/gems/bundler.rbi
deleted file mode 100644
index d423e372fbe..00000000000
--- a/gems/sorbet/test/snapshot/total/empty/expected/sorbet/rbi/gems/bundler.rbi
+++ /dev/null
@@ -1,29 +0,0 @@
-# This file is autogenerated. Do not edit it by hand. Regenerate it with:
-#   srb rbi gems
-
-# typed: strong
-#
-# If you would like to make changes to this file, great! Please create the gem's shim here:
-#
-#   https://github.com/sorbet/sorbet-typed/new/master?filename=lib/bundler/all/bundler.rbi
-#
-# bundler-2.0.1
-module Bundler
-end
-class Bundler::LockfileGenerator
-  def add_bundled_with; end
-  def add_dependencies; end
-  def add_locked_ruby_version; end
-  def add_platforms; end
-  def add_section(name, value); end
-  def add_sources; end
-  def add_specs(specs); end
-  def definition; end
-  def generate!; end
-  def initialize(definition); end
-  def out; end
-  def self.generate(definition); end
-end
-module Kernel
-  def self.gem(dep, *reqs); end
-end