diff --git a/Gemfile b/Gemfile
index 8a1a259..e80ee10 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,26 +33,30 @@ group :development do
 end
 
 group :development, :test do
-  gem 'awesome_print'
-  gem 'binding_of_caller'
-  gem 'brakeman'
-  gem 'byebug', platform: :mri
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'listen'
+
   gem 'guard'
   gem 'guard-brakeman'
   gem 'guard-livereload'
   gem 'guard-minitest'
   gem 'guard-rubocop'
   gem 'guard-shell'
-  gem 'listen', '~> 3.0'
+
   gem 'minitest-reporters'
+  gem 'rails-controller-testing'
   gem 'policy-assertions'
+
+  gem 'byebug', platform: :mri
   gem 'pry-byebug'
   gem 'pry-rails'
-  gem 'rails-controller-testing'
+  gem 'binding_of_caller'
+  gem 'awesome_print'
+
   gem 'rubocop', '~> 0.42.0'
   gem 'simplecov', require: false
-  gem 'spring'
-  gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'brakeman'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
diff --git a/Gemfile.lock b/Gemfile.lock
index 248ef2c..589a2b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -309,7 +309,7 @@ DEPENDENCIES
   jbuilder (~> 2.6)
   jquery-rails
   json (~> 2.0.2)
-  listen (~> 3.0)
+  listen
   mailjet (~> 1.3.8)
   minitest-reporters
   mysql2 (>= 0.3.18, < 0.5)
diff --git a/Guardfile b/Guardfile
index 9beb07c..7a847c9 100644
--- a/Guardfile
+++ b/Guardfile
@@ -72,6 +72,7 @@ end
 
 # ESLint
 guard :shell, all_on_start: true do
+  # TODO: Annoyingly, all files are linted twice on start/full runs. Why?
   watch %r{app/assets/javascripts/*/.*} do |file|
     system %(echo "ESLint:\033[32m #{file[0]}\033[0m")
     system %(eslint #{file[0]})
@@ -86,8 +87,11 @@ guard :rubocop, cli: %w(-D -S) do
 end
 
 guard 'brakeman', run_on_start: true, quiet: true do
-  watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
-  watch(%r{^config/.+\.rb$})
-  watch(%r{^lib/.+\.rb$})
-  watch('Gemfile')
+  ## Lets not watch files for brakeman,
+  ## just scan on guard start, and full runs.
+  #
+  # watch(%r{^app/.+\.(erb|haml|rhtml|rb)$})
+  # watch(%r{^config/.+\.rb$})
+  # watch(%r{^lib/.+\.rb$})
+  # watch('Gemfile')
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7b7fb5b..65a1a33 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,7 +12,6 @@ end
 
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require "minitest/autorun"
 require 'minitest/reporters'
 require 'policy_assertions'
 Dir[Rails.root.join("test/test_helpers/**/*.rb")].each { |f| require f }