diff --git a/Gemfile b/Gemfile
index d1c99fa1a..a9dddef51 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,7 @@ gem "uglifier", ">= 1.3.0"
 group :development, :test do
   gem "govuk_schemas", "~> 4.0"
   gem "jasmine-rails"
-  gem "rubocop-govuk", "~> 2"
+  gem "rubocop-govuk", "~> 3"
   gem "scss_lint-govuk", "~> 0.2"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 508273345..fdebffae4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -181,7 +181,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     null_logger (0.0.1)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     phantomjs (2.1.1.0)
     plek (3.0.0)
@@ -245,23 +245,25 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     robotex (1.0.0)
     rouge (3.16.0)
-    rubocop (0.77.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-govuk (2.0.0)
-      rubocop (= 0.77)
+    rubocop-govuk (3.1.0)
+      rubocop (= 0.80.1)
       rubocop-rails (~> 2)
       rubocop-rspec (~> 1.28)
-    rubocop-rails (2.4.0)
+    rubocop-rails (2.4.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    rubocop-rspec (1.37.0)
+    rubocop-rspec (1.38.1)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
     rubyzip (2.0.0)
@@ -320,7 +322,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     unicorn (5.5.3)
       kgio (~> 2.6)
       raindrops (~> 0.7)
@@ -376,7 +378,7 @@ DEPENDENCIES
   rails-controller-testing (~> 1.0)
   rails-i18n (>= 4.0.4)
   rails_translation_manager (~> 0.1.0)
-  rubocop-govuk (~> 2)
+  rubocop-govuk (~> 3)
   sass-rails (~> 5.0)
   scss_lint-govuk (~> 0.2)
   slimmer (~> 13.2)
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9dc41c3fb..ff284a9bd 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -10,7 +10,7 @@
 require "faker"
 require "minitest/reporters"
 
-Dir[Rails.root.join("test/support/*.rb")].each { |f| require f }
+Dir[Rails.root.join("test/support/*.rb")].sort.each { |f| require f }
 
 Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new