diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
index 0644ed0272e36a2b911a969803d5424a74779286..e0a532363a444c3a3de26a36a764aab029dfde20 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 7ce22f22aa38c36aae7d8c827a57dbb65e59e201..3935d563881c7326f5c25adb76a5bea169a40f6e 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 6eee16f2bf371bbc2a047178fe520f2f6d61e0f0..4dd8ad91c89c0c0e52fdf63e24a3a7420f02d21f 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 1a41b7b25267ba4c1a32983f81bbda99f8aacfa6..10263f163efcc82f0703f70c2246e9efcfa2c57f 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 385d368375c5c943bf9149eb57bda89fad180ca3..2458334053879be626b923867f00dc31c90d0224 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 553800337f5dc928bb2a9e2d711dd1552374af1b..b6986db60944af1667219f9acf4d779a658e2a89 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 c7b37c51ef3a0e364fe4f6c71b815bf4de89bdab..826c986167749beafef34b83b2c4a325c718dcbc 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 ab3056253207b9be372fed2e3dc80c102815614d..884ed0c1d0df0157903178e260d1694b6ce55b1e 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 73d7c4ae098143cbc79628b5b9a84be1c8caf610..362a5134c04c92197a9997902013f9b048e203fd 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 5d3483f6615571048a2502eada1666586fa07782..abdaf869fe48e7158d20c4d9d78bb06827564601 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 1c07f2896bf363ca52e645b1a98c6f154f03ee29..ea7aa9196f627416e2122829729f0a14d8d894d5 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 6a17fd2fc6a621d6cca2bd11c7c02e630543ef69..551c9aec26dd0000aeac76233b9954ef57348185 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 db20d9576f6ca2f38c83a1fbd0570deeff1ec666..c39709d7b57cdf8be5599ace80e3f491b7cd1ba3 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 338fcf235513193503ec1d572f2e2a713ed42661..da89510ad31eec8f7c937d9355ef9ee37bbdd33d 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 0ca6bce28f2ca3d3efc3de93d32135a36c436071..da828fe11234284816e54003b5e0ee6b46027aa8 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 0dfe5158b42d398802ea4d19f49227d212c3ce86..30420a793a24c00f95f97a010f9c02725ea0c6a5 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 2a6a25288bb838cb08a3affe54117e21df38ce26..c6dca8c67a9cd6ba5dd77e293a7e770979208984 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 c38f9d4eab574a5c0edeae48c0ed65f3983164ea..3ab4efd14b978d096f6bfa963ac971d6628c74b9 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 802bcfee6eb4edd0b1df38c407c5ab850cae660d..edc3015844df47d83317baecb305ead22ce8b6ba 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 8273f3ebcbce8f8c64f7623baedca3500d03d41a..7ada0bebd38230025734ff59109e4ee4cd5e5992 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 38a25cfc69dfd0ae43417c9c42101d47e451da5b..cc69b696ebc61281e4144c935c37ae7045067239 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 3cb44387ca5fa0721dfd79697c630b865f4fd62a..f363ca3853fac6ff62918b50b82ded88a1e80dd2 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 0f311f904e26a74bb5973b03b6ed34f0c5c20f8a..788d9f6fc956f55f62996519d1bd8293c1035d37 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 6f19cc329342e313d05d87bebc3012c75f89fb92..38af72d2318865ecb74146a5f1f96ced0d6810f1 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 79eb3a29384a78607a64d94bae39070050b9eff0..32a8e3f918c1ebdcbca8ffdeefe5fc3dd3cff0c3 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 9240db0fd240e4bfe181e53b799447d23eac3f51..2620572bbaadcd1a217254559aed23d525468ec8 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 7195efb1b4e8b98940464ba8327e879ddb08f0b6..00190a32b9bf919e18c6468425f671dc75b5fa29 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 ef0e824bb518221296f037a6ed13146c018c7981..79f1d0d522f2a104ec78cfe69a54f6e301f654b2 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 0c04a98c0561d28d7c5cf456dd2d3720fa18d41e..8f5f96e6606133ca14f9804762c2239434a0b125 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 d141ba82f0e33bd034644cc791ba1b20643810a9..1cb87980aa2dd10c199d9e409a23d97a4130a6e8 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 5664b93ccb24e0c717373f8d898f8bfd65553137..bc39a08e5b3e587db284854898400c8f953b5b52 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 }