diff --git a/Gemfile b/Gemfile
index 492c6357c..f2ab0868a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,30 +6,19 @@ group :rake do
 end
 
 group :lint do
-  gem 'foodcritic', '~> 5.0'
-  gem 'rubocop', '~> 0.34'
+  gem 'foodcritic', '~> 6.0'
+  gem 'rubocop', '~> 0.38'
 end
 
 group :unit do
-  gem 'berkshelf',  '~> 4.0'
-  gem 'chefspec',   '~> 4.4'
+  gem 'berkshelf', '~> 4.3'
+  gem 'chefspec', '~> 4.6'
 end
 
 group :kitchen_common do
-  gem 'test-kitchen', '~> 1.4'
+  gem 'test-kitchen', '~> 1.6'
 end
 
 group :kitchen_vagrant do
   gem 'kitchen-vagrant', '~> 0.19'
 end
-
-group :development do
-  gem 'ruby_gntp'
-  gem 'growl'
-  gem 'rb-fsevent'
-  gem 'guard', '~> 2.4'
-  gem 'guard-kitchen'
-  gem 'guard-foodcritic'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-end
diff --git a/Guardfile b/Guardfile
deleted file mode 100644
index 0b7860f3b..000000000
--- a/Guardfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# More info at https://github.com/guard/guard#readme
-
-# guard 'foodcritic', :cookbook_paths => '.', :cli => '-t ~FC023 -t ~FC005', :all_on_start => false do
-#   watch(/attributes\/.+\.rb$/)
-#   watch(/providers\/.+\.rb$/)
-#   watch(/recipes\/.+\.rb$/)
-#   watch(/resources\/.+\.rb$/)
-#   watch('metadata.rb')
-# end
-
-guard 'rubocop' do
-  watch(/attributes\/.+\.rb$/)
-  watch(/providers\/.+\.rb$/)
-  watch(/recipes\/.+\.rb$/)
-  watch(/resources\/.+\.rb$/)
-  watch('metadata.rb')
-end
-
-guard :rspec, cmd: 'chef exec /opt/chefdk/embedded/bin/rspec', all_on_start: false, notification: false do
-  watch(/^libraries\/(.+)\.rb$/)
-  watch(/^spec\/(.+)_spec\.rb$/)
-  watch(/^(recipes)\/(.+)\.rb$/) { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { 'spec' }
-end