diff --git a/Gemfile b/Gemfile
index 40d317da..a5f52746 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,14 +4,8 @@ gemspec name: "mixlib-shellout"
 
 gem "parallel", "< 1.20" # pin until we drop ruby < 2.4
 
-group :docs do
-  gem "github-markup"
-  gem "redcarpet"
-  gem "yard"
-end
-
 group :test do
-  gem "chefstyle", "1.2.0"
+  gem "chefstyle", "1.5.1"
   gem "rake"
   gem "rspec", "~> 3.0"
 end
diff --git a/Rakefile b/Rakefile
index 4b83938e..ebc88265 100644
--- a/Rakefile
+++ b/Rakefile
@@ -25,13 +25,6 @@ rescue LoadError
   puts "chefstyle gem is not installed. bundle install first to make sure all dependencies are installed."
 end
 
-begin
-  require "yard"
-  YARD::Rake::YardocTask.new(:docs)
-rescue LoadError
-  puts "yard is not available. bundle install first to make sure all dependencies are installed."
-end
-
 task :console do
   require "irb"
   require "irb/completion"
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ebc5a84a..b8a10c1f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,8 +5,7 @@
 require "timeout"
 
 # Load everything from spec/support
-# Do not change the gsub.
-Dir["spec/support/**/*.rb"].map { |f| f.gsub(/.rb$/, "") }.each { |f| require f }
+Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
 
 RSpec.configure do |config|
   config.mock_with :rspec