diff --git a/Gemfile b/Gemfile
index 762d9442..557ce68c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,6 +13,11 @@ group :test do
   gem "cookstyle", ">= 7.32"
   gem "faraday_middleware"
   gem "chef-test-kitchen-enterprise", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main"
+  gem "test-kitchen", git: "https://github.com/chef/chef-test-kitchen-enterprise", branch: "main", glob: "test-kitchen.gemspec"
+  # TODO: Replace kitchen-omnibus-chef with kitchen-chef-enterprise once private repo access is available for public runners
+  # kitchen-omnibus-chef is deprecated and won't receive updates, but provides chef-zero provisioner functionality
+  # gem "kitchen-chef-enterprise", git: "https://github.com/chef/kitchen-chef-enterprise", branch: "main"
+  gem "kitchen-omnibus-chef", "~> 1.1"
   gem "simplecov", require: false
 end
 
diff --git a/cleanup_lint_roller.rb b/cleanup_lint_roller.rb
index 801ceaf9..b29fba50 100644
--- a/cleanup_lint_roller.rb
+++ b/cleanup_lint_roller.rb
@@ -24,4 +24,4 @@ def cleanup_lint_roller_lockfile
   warn "  Warning: Failed to clean up lint_roller Gemfile.lock: #{e.message}"
 end
 
-cleanup_lint_roller_lockfile
\ No newline at end of file
+cleanup_lint_roller_lockfile
diff --git a/post-bundle-install.rb b/post-bundle-install.rb
index e9ae4304..f61e54d8 100644
--- a/post-bundle-install.rb
+++ b/post-bundle-install.rb
@@ -16,15 +16,17 @@
   matches = File.basename(gempath).match(/.*-[A-Fa-f0-9]{12}/)
   next unless matches
 
-  gem_name = File.basename(Dir["#{gempath}/*.gemspec"].first, ".gemspec")
-  # FIXME: should strip any valid ruby platform off of the gem_name if it matches
+  Dir["#{gempath}/*.gemspec"].each do |gemspec_path|
+    gem_name = File.basename(gemspec_path, ".gemspec")
+    # FIXME: should strip any valid ruby platform off of the gem_name if it matches
 
-  next unless gem_name
+    next unless gem_name
 
-  puts "re-installing #{gem_name}..."
+    puts "re-installing #{gem_name}..."
 
-  Dir.chdir(gempath) do
-    system("gem build #{gem_name}.gemspec") or raise "gem build failed"
-    system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed"
+    Dir.chdir(gempath) do
+      system("gem build #{gem_name}.gemspec") or raise "gem build failed"
+      system("gem install #{gem_name}*.gem --conservative --minimal-deps --no-document") or raise "gem install failed"
+    end
   end
 end