diff --git a/Rakefile b/Rakefile
index 16b61bd1..892dc444 100644
--- a/Rakefile
+++ b/Rakefile
@@ -46,6 +46,8 @@ task :test do
   GEM_PATHS.each do |g|
     Dir.chdir("#{File.join(ROOT, g)}") { sh "#{Gem.ruby} -S rake test" }
   end
+
+  Rake::Task['rubocop'].invoke
 end
 
 desc 'Run specs for all middleman gems'
@@ -55,15 +57,10 @@ task :spec do
   end
 end
 
-begin
-  require 'rubocop/rake_task'
-  if defined?(Rubocop)
-    desc 'Run RuboCop to check code consistency'
-    Rubocop::RakeTask.new(:rubocop) do |task|
-      task.fail_on_error = false
-    end
-  end
-rescue LoadError
+require 'rubocop/rake_task'
+desc 'Run RuboCop to check code consistency'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.fail_on_error = false
 end
 
 desc 'Run tests for all middleman gems'