diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
index 0644ed0272..e0a532363a 100644
--- a/Library/Homebrew/rubocops.rb
+++ b/Library/Homebrew/rubocops.rb
@@ -1,16 +1,14 @@
-require_relative "global"
-
-require "rubocops/formula_desc_cop"
-require "rubocops/components_order_cop"
-require "rubocops/components_redundancy_cop"
-require "rubocops/dependency_order_cop"
-require "rubocops/homepage_cop"
-require "rubocops/text_cop"
-require "rubocops/caveats_cop"
-require "rubocops/checksum_cop"
-require "rubocops/patches_cop"
-require "rubocops/conflicts_cop"
-require "rubocops/options_cop"
-require "rubocops/urls_cop"
-require "rubocops/lines_cop"
-require "rubocops/class_cop"
+require_relative "./rubocops/formula_desc_cop"
+require_relative "./rubocops/components_order_cop"
+require_relative "./rubocops/components_redundancy_cop"
+require_relative "./rubocops/dependency_order_cop"
+require_relative "./rubocops/homepage_cop"
+require_relative "./rubocops/text_cop"
+require_relative "./rubocops/caveats_cop"
+require_relative "./rubocops/checksum_cop"
+require_relative "./rubocops/patches_cop"
+require_relative "./rubocops/conflicts_cop"
+require_relative "./rubocops/options_cop"
+require_relative "./rubocops/urls_cop"
+require_relative "./rubocops/lines_cop"
+require_relative "./rubocops/class_cop"
diff --git a/Library/Homebrew/rubocops/caveats_cop.rb b/Library/Homebrew/rubocops/caveats_cop.rb
index 7ce22f22aa..3935d56388 100644
--- a/Library/Homebrew/rubocops/caveats_cop.rb
+++ b/Library/Homebrew/rubocops/caveats_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/checksum_cop.rb b/Library/Homebrew/rubocops/checksum_cop.rb
index 6eee16f2bf..4dd8ad91c8 100644
--- a/Library/Homebrew/rubocops/checksum_cop.rb
+++ b/Library/Homebrew/rubocops/checksum_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/class_cop.rb b/Library/Homebrew/rubocops/class_cop.rb
index 1a41b7b252..10263f163e 100644
--- a/Library/Homebrew/rubocops/class_cop.rb
+++ b/Library/Homebrew/rubocops/class_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/components_order_cop.rb b/Library/Homebrew/rubocops/components_order_cop.rb
index 385d368375..2458334053 100644
--- a/Library/Homebrew/rubocops/components_order_cop.rb
+++ b/Library/Homebrew/rubocops/components_order_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/components_redundancy_cop.rb b/Library/Homebrew/rubocops/components_redundancy_cop.rb
index 553800337f..b6986db609 100644
--- a/Library/Homebrew/rubocops/components_redundancy_cop.rb
+++ b/Library/Homebrew/rubocops/components_redundancy_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/conflicts_cop.rb b/Library/Homebrew/rubocops/conflicts_cop.rb
index c7b37c51ef..826c986167 100644
--- a/Library/Homebrew/rubocops/conflicts_cop.rb
+++ b/Library/Homebrew/rubocops/conflicts_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/dependency_order_cop.rb b/Library/Homebrew/rubocops/dependency_order_cop.rb
index ab30562532..884ed0c1d0 100644
--- a/Library/Homebrew/rubocops/dependency_order_cop.rb
+++ b/Library/Homebrew/rubocops/dependency_order_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/extend/formula_cop.rb b/Library/Homebrew/rubocops/extend/formula_cop.rb
index 73d7c4ae09..362a5134c0 100644
--- a/Library/Homebrew/rubocops/extend/formula_cop.rb
+++ b/Library/Homebrew/rubocops/extend/formula_cop.rb
@@ -7,7 +7,7 @@ ensure
   $VERBOSE = old_verbosity
 end
 
-require "extend/string"
+require_relative "../../extend/string"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc_cop.rb
index 5d3483f661..abdaf869fe 100644
--- a/Library/Homebrew/rubocops/formula_desc_cop.rb
+++ b/Library/Homebrew/rubocops/formula_desc_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/homepage_cop.rb b/Library/Homebrew/rubocops/homepage_cop.rb
index 1c07f2896b..ea7aa9196f 100644
--- a/Library/Homebrew/rubocops/homepage_cop.rb
+++ b/Library/Homebrew/rubocops/homepage_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/lines_cop.rb b/Library/Homebrew/rubocops/lines_cop.rb
index 6a17fd2fc6..551c9aec26 100644
--- a/Library/Homebrew/rubocops/lines_cop.rb
+++ b/Library/Homebrew/rubocops/lines_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/options_cop.rb b/Library/Homebrew/rubocops/options_cop.rb
index db20d9576f..c39709d7b5 100644
--- a/Library/Homebrew/rubocops/options_cop.rb
+++ b/Library/Homebrew/rubocops/options_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/patches_cop.rb b/Library/Homebrew/rubocops/patches_cop.rb
index 338fcf2355..da89510ad3 100644
--- a/Library/Homebrew/rubocops/patches_cop.rb
+++ b/Library/Homebrew/rubocops/patches_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/text_cop.rb b/Library/Homebrew/rubocops/text_cop.rb
index 0ca6bce28f..da828fe112 100644
--- a/Library/Homebrew/rubocops/text_cop.rb
+++ b/Library/Homebrew/rubocops/text_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/rubocops/urls_cop.rb b/Library/Homebrew/rubocops/urls_cop.rb
index 0dfe5158b4..30420a793a 100644
--- a/Library/Homebrew/rubocops/urls_cop.rb
+++ b/Library/Homebrew/rubocops/urls_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 2a6a25288b..c6dca8c67a 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -271,7 +271,7 @@ class Tap
           raise "Cannot tap #{name}: invalid syntax in tap!"
         end
       end
-    rescue Interrupt, RuntimeError
+    rescue Interrupt, ErrorDuringExecution, RuntimeError
       ignore_interrupts do
         # wait for git to possibly cleanup the top directory when interrupt happens.
         sleep 0.1
diff --git a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
index c38f9d4eab..3ab4efd14b 100644
--- a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/caveats_cop"
+require_relative "../../rubocops/caveats_cop"
 
 describe RuboCop::Cop::FormulaAudit::Caveats do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
index 802bcfee6e..edc3015844 100644
--- a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/checksum_cop"
+require_relative "../../rubocops/checksum_cop"
 
 describe RuboCop::Cop::FormulaAudit::Checksum do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/class_cop_spec.rb b/Library/Homebrew/test/rubocops/class_cop_spec.rb
index 8273f3ebcb..7ada0bebd3 100644
--- a/Library/Homebrew/test/rubocops/class_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/class_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/class_cop"
+require_relative "../../rubocops/class_cop"
 
 describe RuboCop::Cop::FormulaAudit::ClassName do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
index 38a25cfc69..cc69b696eb 100644
--- a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/components_order_cop"
+require_relative "../../rubocops/components_order_cop"
 
 describe RuboCop::Cop::FormulaAudit::ComponentsOrder do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
index 3cb44387ca..f363ca3853 100644
--- a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/components_redundancy_cop"
+require_relative "../../rubocops/components_redundancy_cop"
 
 describe RuboCop::Cop::FormulaAudit::ComponentsRedundancy do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
index 0f311f904e..788d9f6fc9 100644
--- a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/conflicts_cop"
+require_relative "../../rubocops/conflicts_cop"
 
 describe RuboCop::Cop::FormulaAudit::Conflicts do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb b/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb
index 6f19cc3293..38af72d231 100644
--- a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/dependency_order_cop"
+require_relative "../../rubocops/dependency_order_cop"
 
 describe RuboCop::Cop::NewFormulaAudit::DependencyOrder do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
index 79eb3a2938..32a8e3f918 100644
--- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/formula_desc_cop"
+require_relative "../../rubocops/formula_desc_cop"
 
 describe RuboCop::Cop::FormulaAudit::DescLength do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
index 9240db0fd2..2620572bba 100644
--- a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/homepage_cop"
+require_relative "../../rubocops/homepage_cop"
 
 describe RuboCop::Cop::FormulaAudit::Homepage do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
index 7195efb1b4..00190a32b9 100644
--- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/lines_cop"
+require_relative "../../rubocops/lines_cop"
 
 describe RuboCop::Cop::FormulaAudit::Lines do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/options_cop_spec.rb b/Library/Homebrew/test/rubocops/options_cop_spec.rb
index ef0e824bb5..79f1d0d522 100644
--- a/Library/Homebrew/test/rubocops/options_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/options_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/options_cop"
+require_relative "../../rubocops/options_cop"
 
 describe RuboCop::Cop::FormulaAudit::Options do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/patches_cop_spec.rb b/Library/Homebrew/test/rubocops/patches_cop_spec.rb
index 0c04a98c05..8f5f96e660 100644
--- a/Library/Homebrew/test/rubocops/patches_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/patches_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/patches_cop"
+require_relative "../../rubocops/patches_cop"
 
 describe RuboCop::Cop::FormulaAudit::Patches do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/text_cop_spec.rb b/Library/Homebrew/test/rubocops/text_cop_spec.rb
index d141ba82f0..1cb87980aa 100644
--- a/Library/Homebrew/test/rubocops/text_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/text_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/text_cop"
+require_relative "../../rubocops/text_cop"
 
 describe RuboCop::Cop::FormulaAudit::Text do
   subject(:cop) { described_class.new }
diff --git a/Library/Homebrew/test/rubocops/urls_cop_spec.rb b/Library/Homebrew/test/rubocops/urls_cop_spec.rb
index 5664b93ccb..bc39a08e5b 100644
--- a/Library/Homebrew/test/rubocops/urls_cop_spec.rb
+++ b/Library/Homebrew/test/rubocops/urls_cop_spec.rb
@@ -1,4 +1,4 @@
-require "rubocops/urls_cop"
+require_relative "../../rubocops/urls_cop"
 
 describe RuboCop::Cop::FormulaAudit::Urls do
   subject(:cop) { described_class.new }