From 9dc1f8f3cd405bc299eb688075687f951afd3e13 Mon Sep 17 00:00:00 2001
From: Markus Reiter <me@reitermark.us>
Date: Sun, 13 Nov 2016 21:35:20 +0100
Subject: [PATCH] Require `integration_command_test_case` in `testing_env`.

---
 .../test/support/helper/integration_command_test_case.rb         | 1 +
 Library/Homebrew/test/test/ENV_test.rb                           | 1 -
 Library/Homebrew/test/test/analytics_test.rb                     | 1 -
 Library/Homebrew/test/test/bottle_test.rb                        | 1 -
 Library/Homebrew/test/test/bundle_test.rb                        | 1 -
 Library/Homebrew/test/test/cache_formula_test.rb                 | 1 -
 Library/Homebrew/test/test/cache_test.rb                         | 1 -
 Library/Homebrew/test/test/cask_test.rb                          | 1 -
 Library/Homebrew/test/test/cat_test.rb                           | 1 -
 Library/Homebrew/test/test/cellar_formula_test.rb                | 1 -
 Library/Homebrew/test/test/cellar_test.rb                        | 1 -
 Library/Homebrew/test/test/cleanup_test.rb                       | 1 -
 Library/Homebrew/test/test/command_test.rb                       | 1 -
 Library/Homebrew/test/test/commands_test.rb                      | 1 -
 Library/Homebrew/test/test/config_test.rb                        | 1 -
 Library/Homebrew/test/test/create_test.rb                        | 1 -
 Library/Homebrew/test/test/custom_command_test.rb                | 1 -
 Library/Homebrew/test/test/deps_test.rb                          | 1 -
 Library/Homebrew/test/test/desc_test.rb                          | 1 -
 Library/Homebrew/test/test/doctor_test.rb                        | 1 -
 Library/Homebrew/test/test/edit_test.rb                          | 1 -
 Library/Homebrew/test/test/fetch_test.rb                         | 1 -
 Library/Homebrew/test/test/help_test.rb                          | 1 -
 Library/Homebrew/test/test/home_test.rb                          | 1 -
 Library/Homebrew/test/test/info_test.rb                          | 1 -
 Library/Homebrew/test/test/install_test.rb                       | 1 -
 Library/Homebrew/test/test/irb_test.rb                           | 1 -
 Library/Homebrew/test/test/leaves_test.rb                        | 1 -
 Library/Homebrew/test/test/link_test.rb                          | 1 -
 Library/Homebrew/test/test/linkapps_test.rb                      | 1 -
 Library/Homebrew/test/test/list_test.rb                          | 1 -
 Library/Homebrew/test/test/log_formula_test.rb                   | 1 -
 Library/Homebrew/test/test/log_test.rb                           | 1 -
 Library/Homebrew/test/test/migrate_test.rb                       | 1 -
 Library/Homebrew/test/test/missing_test.rb                       | 1 -
 Library/Homebrew/test/test/options_test.rb                       | 1 -
 Library/Homebrew/test/test/outdated_test.rb                      | 1 -
 Library/Homebrew/test/test/pin_unpin_test.rb                     | 1 -
 Library/Homebrew/test/test/prefix_formula_test.rb                | 1 -
 Library/Homebrew/test/test/prefix_test.rb                        | 1 -
 Library/Homebrew/test/test/prune_test.rb                         | 1 -
 Library/Homebrew/test/test/pull_offline_test.rb                  | 1 -
 Library/Homebrew/test/test/pull_test.rb                          | 1 -
 Library/Homebrew/test/test/readall_test.rb                       | 1 -
 Library/Homebrew/test/test/reinstall_pinned_test.rb              | 1 -
 Library/Homebrew/test/test/reinstall_test.rb                     | 1 -
 Library/Homebrew/test/test/repository_test.rb                    | 1 -
 Library/Homebrew/test/test/search_test.rb                        | 1 -
 Library/Homebrew/test/test/services_test.rb                      | 1 -
 Library/Homebrew/test/test/sh_test.rb                            | 1 -
 Library/Homebrew/test/test/switch_test.rb                        | 1 -
 Library/Homebrew/test/test/tap_new_test.rb                       | 1 -
 Library/Homebrew/test/test/tap_test.rb                           | 1 -
 Library/Homebrew/test/test/test_formula_test.rb                  | 1 -
 Library/Homebrew/test/test/uninstall_test.rb                     | 1 -
 Library/Homebrew/test/test/unlink_test.rb                        | 1 -
 Library/Homebrew/test/test/unlinkapps_test.rb                    | 1 -
 Library/Homebrew/test/test/unpack_test.rb                        | 1 -
 Library/Homebrew/test/test/upgrade_test.rb                       | 1 -
 Library/Homebrew/test/test/uses_test.rb                          | 1 -
 Library/Homebrew/test/test/version_test.rb                       | 1 -
 Library/Homebrew/test/testing_env.rb                             | 1 +
 62 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/Library/Homebrew/test/support/helper/integration_command_test_case.rb b/Library/Homebrew/test/support/helper/integration_command_test_case.rb
index 9306617eb8..5940fd84b6 100644
--- a/Library/Homebrew/test/support/helper/integration_command_test_case.rb
+++ b/Library/Homebrew/test/support/helper/integration_command_test_case.rb
@@ -2,6 +2,7 @@ require "bundler"
 require "fileutils"
 require "pathname"
 require "formula"
+require "test/support/helper/test_case"
 
 class IntegrationCommandTestCase < Homebrew::TestCase
   def setup
diff --git a/Library/Homebrew/test/test/ENV_test.rb b/Library/Homebrew/test/test/ENV_test.rb
index 1736d34af5..6c0e68a9e3 100644
--- a/Library/Homebrew/test/test/ENV_test.rb
+++ b/Library/Homebrew/test/test/ENV_test.rb
@@ -1,7 +1,6 @@
 require "testing_env"
 require "extend/ENV"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestEnv < IntegrationCommandTestCase
   def test_env
diff --git a/Library/Homebrew/test/test/analytics_test.rb b/Library/Homebrew/test/test/analytics_test.rb
index 266c5bd098..37040f3cd8 100644
--- a/Library/Homebrew/test/test/analytics_test.rb
+++ b/Library/Homebrew/test/test/analytics_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestAnalytics < IntegrationCommandTestCase
   def test_analytics
diff --git a/Library/Homebrew/test/test/bottle_test.rb b/Library/Homebrew/test/test/bottle_test.rb
index 5fdba0af82..c10746e098 100644
--- a/Library/Homebrew/test/test/bottle_test.rb
+++ b/Library/Homebrew/test/test/bottle_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestBottle < IntegrationCommandTestCase
   def test_bottle
diff --git a/Library/Homebrew/test/test/bundle_test.rb b/Library/Homebrew/test/test/bundle_test.rb
index ea18d5f843..ae47977d84 100644
--- a/Library/Homebrew/test/test/bundle_test.rb
+++ b/Library/Homebrew/test/test/bundle_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestBundle < IntegrationCommandTestCase
   def test_bundle
diff --git a/Library/Homebrew/test/test/cache_formula_test.rb b/Library/Homebrew/test/test/cache_formula_test.rb
index c64ce9809a..6dcb6a745a 100644
--- a/Library/Homebrew/test/test/cache_formula_test.rb
+++ b/Library/Homebrew/test/test/cache_formula_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCacheFormula < IntegrationCommandTestCase
   def test_cache_formula
diff --git a/Library/Homebrew/test/test/cache_test.rb b/Library/Homebrew/test/test/cache_test.rb
index f8c0356761..3a9e6b0111 100644
--- a/Library/Homebrew/test/test/cache_test.rb
+++ b/Library/Homebrew/test/test/cache_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCache < IntegrationCommandTestCase
   def test_cache
diff --git a/Library/Homebrew/test/test/cask_test.rb b/Library/Homebrew/test/test/cask_test.rb
index ad7a2a0a0e..d5b81facb6 100644
--- a/Library/Homebrew/test/test/cask_test.rb
+++ b/Library/Homebrew/test/test/cask_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCask < IntegrationCommandTestCase
   def test_cask
diff --git a/Library/Homebrew/test/test/cat_test.rb b/Library/Homebrew/test/test/cat_test.rb
index df64188d6c..bb37b5fdec 100644
--- a/Library/Homebrew/test/test/cat_test.rb
+++ b/Library/Homebrew/test/test/cat_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCat < IntegrationCommandTestCase
   def test_cat
diff --git a/Library/Homebrew/test/test/cellar_formula_test.rb b/Library/Homebrew/test/test/cellar_formula_test.rb
index 6c3063ca3b..38a934a7ba 100644
--- a/Library/Homebrew/test/test/cellar_formula_test.rb
+++ b/Library/Homebrew/test/test/cellar_formula_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCellarFormula < IntegrationCommandTestCase
   def test_cellar_formula
diff --git a/Library/Homebrew/test/test/cellar_test.rb b/Library/Homebrew/test/test/cellar_test.rb
index 32cdb1af50..74d5389f81 100644
--- a/Library/Homebrew/test/test/cellar_test.rb
+++ b/Library/Homebrew/test/test/cellar_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCellar < IntegrationCommandTestCase
   def test_cellar
diff --git a/Library/Homebrew/test/test/cleanup_test.rb b/Library/Homebrew/test/test/cleanup_test.rb
index fef249fcba..bb8e1cdc61 100644
--- a/Library/Homebrew/test/test/cleanup_test.rb
+++ b/Library/Homebrew/test/test/cleanup_test.rb
@@ -4,7 +4,6 @@ require "cleanup"
 require "fileutils"
 require "pathname"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCleanup < IntegrationCommandTestCase
   def test_cleanup
diff --git a/Library/Homebrew/test/test/command_test.rb b/Library/Homebrew/test/test/command_test.rb
index 620a014b91..d5c7aaa88c 100644
--- a/Library/Homebrew/test/test/command_test.rb
+++ b/Library/Homebrew/test/test/command_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCommand < IntegrationCommandTestCase
   def test_command
diff --git a/Library/Homebrew/test/test/commands_test.rb b/Library/Homebrew/test/test/commands_test.rb
index cbb446ae3d..d44d2da0e7 100644
--- a/Library/Homebrew/test/test/commands_test.rb
+++ b/Library/Homebrew/test/test/commands_test.rb
@@ -3,7 +3,6 @@ require "cmd/command"
 require "cmd/commands"
 require "fileutils"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCommands < IntegrationCommandTestCase
   def test_commands
diff --git a/Library/Homebrew/test/test/config_test.rb b/Library/Homebrew/test/test/config_test.rb
index 1a793cc6be..81da4660af 100644
--- a/Library/Homebrew/test/test/config_test.rb
+++ b/Library/Homebrew/test/test/config_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestConfig < IntegrationCommandTestCase
   def test_config
diff --git a/Library/Homebrew/test/test/create_test.rb b/Library/Homebrew/test/test/create_test.rb
index 26a325a22f..aeee428aa9 100644
--- a/Library/Homebrew/test/test/create_test.rb
+++ b/Library/Homebrew/test/test/create_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCreate < IntegrationCommandTestCase
   def test_create
diff --git a/Library/Homebrew/test/test/custom_command_test.rb b/Library/Homebrew/test/test/custom_command_test.rb
index 71bfafd9b5..8d05bc6c7f 100644
--- a/Library/Homebrew/test/test/custom_command_test.rb
+++ b/Library/Homebrew/test/test/custom_command_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestCustomCommand < IntegrationCommandTestCase
   def test_custom_command
diff --git a/Library/Homebrew/test/test/deps_test.rb b/Library/Homebrew/test/test/deps_test.rb
index 44803af5e5..01639857c9 100644
--- a/Library/Homebrew/test/test/deps_test.rb
+++ b/Library/Homebrew/test/test/deps_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestDeps < IntegrationCommandTestCase
   def test_deps
diff --git a/Library/Homebrew/test/test/desc_test.rb b/Library/Homebrew/test/test/desc_test.rb
index 7428c07924..2ba498135e 100644
--- a/Library/Homebrew/test/test/desc_test.rb
+++ b/Library/Homebrew/test/test/desc_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestDesc < IntegrationCommandTestCase
   def test_desc
diff --git a/Library/Homebrew/test/test/doctor_test.rb b/Library/Homebrew/test/test/doctor_test.rb
index be1098d22b..d2dc871f40 100644
--- a/Library/Homebrew/test/test/doctor_test.rb
+++ b/Library/Homebrew/test/test/doctor_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestDoctor < IntegrationCommandTestCase
   def test_doctor
diff --git a/Library/Homebrew/test/test/edit_test.rb b/Library/Homebrew/test/test/edit_test.rb
index c78db3bd80..9b6ded6519 100644
--- a/Library/Homebrew/test/test/edit_test.rb
+++ b/Library/Homebrew/test/test/edit_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestEdit < IntegrationCommandTestCase
   def test_edit
diff --git a/Library/Homebrew/test/test/fetch_test.rb b/Library/Homebrew/test/test/fetch_test.rb
index e049db5541..e08e545e3b 100644
--- a/Library/Homebrew/test/test/fetch_test.rb
+++ b/Library/Homebrew/test/test/fetch_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestFetch < IntegrationCommandTestCase
   def test_fetch
diff --git a/Library/Homebrew/test/test/help_test.rb b/Library/Homebrew/test/test/help_test.rb
index 8c9a4bb081..92dd997217 100644
--- a/Library/Homebrew/test/test/help_test.rb
+++ b/Library/Homebrew/test/test/help_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestHelp < IntegrationCommandTestCase
   def test_help
diff --git a/Library/Homebrew/test/test/home_test.rb b/Library/Homebrew/test/test/home_test.rb
index 9116442b7b..ff06b72c1d 100644
--- a/Library/Homebrew/test/test/home_test.rb
+++ b/Library/Homebrew/test/test/home_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestHome < IntegrationCommandTestCase
   def test_home
diff --git a/Library/Homebrew/test/test/info_test.rb b/Library/Homebrew/test/test/info_test.rb
index a4186a5e9a..f71044bf02 100644
--- a/Library/Homebrew/test/test/info_test.rb
+++ b/Library/Homebrew/test/test/info_test.rb
@@ -2,7 +2,6 @@ require "testing_env"
 require "cmd/info"
 require "formula"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestInfo < IntegrationCommandTestCase
   def test_info
diff --git a/Library/Homebrew/test/test/install_test.rb b/Library/Homebrew/test/test/install_test.rb
index 3131259311..fa1057a027 100644
--- a/Library/Homebrew/test/test/install_test.rb
+++ b/Library/Homebrew/test/test/install_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestInstall < IntegrationCommandTestCase
   def test_install
diff --git a/Library/Homebrew/test/test/irb_test.rb b/Library/Homebrew/test/test/irb_test.rb
index 77ca4a90db..832ca39a50 100644
--- a/Library/Homebrew/test/test/irb_test.rb
+++ b/Library/Homebrew/test/test/irb_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestIrb < IntegrationCommandTestCase
   def test_irb
diff --git a/Library/Homebrew/test/test/leaves_test.rb b/Library/Homebrew/test/test/leaves_test.rb
index ef25a4b6eb..f73fba1ea3 100644
--- a/Library/Homebrew/test/test/leaves_test.rb
+++ b/Library/Homebrew/test/test/leaves_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestLeaves < IntegrationCommandTestCase
   def test_leaves
diff --git a/Library/Homebrew/test/test/link_test.rb b/Library/Homebrew/test/test/link_test.rb
index ecabe0c675..062caa0c07 100644
--- a/Library/Homebrew/test/test/link_test.rb
+++ b/Library/Homebrew/test/test/link_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestLink < IntegrationCommandTestCase
   def test_link
diff --git a/Library/Homebrew/test/test/linkapps_test.rb b/Library/Homebrew/test/test/linkapps_test.rb
index a0b33a543d..4c5b8ec134 100644
--- a/Library/Homebrew/test/test/linkapps_test.rb
+++ b/Library/Homebrew/test/test/linkapps_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestLinkapps < IntegrationCommandTestCase
   def test_linkapps
diff --git a/Library/Homebrew/test/test/list_test.rb b/Library/Homebrew/test/test/list_test.rb
index 26aab741f4..3c691e3adc 100644
--- a/Library/Homebrew/test/test/list_test.rb
+++ b/Library/Homebrew/test/test/list_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestList < IntegrationCommandTestCase
   def test_list
diff --git a/Library/Homebrew/test/test/log_formula_test.rb b/Library/Homebrew/test/test/log_formula_test.rb
index 26c10d3812..bb6a1f6619 100644
--- a/Library/Homebrew/test/test/log_formula_test.rb
+++ b/Library/Homebrew/test/test/log_formula_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestLogFormula < IntegrationCommandTestCase
   def test_log_formula
diff --git a/Library/Homebrew/test/test/log_test.rb b/Library/Homebrew/test/test/log_test.rb
index c9eb73d978..b2e150ccd5 100644
--- a/Library/Homebrew/test/test/log_test.rb
+++ b/Library/Homebrew/test/test/log_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestLog < IntegrationCommandTestCase
   def test_log
diff --git a/Library/Homebrew/test/test/migrate_test.rb b/Library/Homebrew/test/test/migrate_test.rb
index c267629a31..17929d0383 100644
--- a/Library/Homebrew/test/test/migrate_test.rb
+++ b/Library/Homebrew/test/test/migrate_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestMigrate < IntegrationCommandTestCase
   def test_migrate
diff --git a/Library/Homebrew/test/test/missing_test.rb b/Library/Homebrew/test/test/missing_test.rb
index 9ad0ab0b8c..4f20d8a7af 100644
--- a/Library/Homebrew/test/test/missing_test.rb
+++ b/Library/Homebrew/test/test/missing_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestMissing < IntegrationCommandTestCase
   def setup
diff --git a/Library/Homebrew/test/test/options_test.rb b/Library/Homebrew/test/test/options_test.rb
index 43ea26b97e..e7189a6042 100644
--- a/Library/Homebrew/test/test/options_test.rb
+++ b/Library/Homebrew/test/test/options_test.rb
@@ -1,7 +1,6 @@
 require "testing_env"
 require "options"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestOptions < IntegrationCommandTestCase
   def test_options
diff --git a/Library/Homebrew/test/test/outdated_test.rb b/Library/Homebrew/test/test/outdated_test.rb
index 03c2293d8c..3e7148ded4 100644
--- a/Library/Homebrew/test/test/outdated_test.rb
+++ b/Library/Homebrew/test/test/outdated_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestOutdated < IntegrationCommandTestCase
   def test_outdated
diff --git a/Library/Homebrew/test/test/pin_unpin_test.rb b/Library/Homebrew/test/test/pin_unpin_test.rb
index 9603620a30..65fb9e4daa 100644
--- a/Library/Homebrew/test/test/pin_unpin_test.rb
+++ b/Library/Homebrew/test/test/pin_unpin_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPinUnpin < IntegrationCommandTestCase
   def test_pin_unpin
diff --git a/Library/Homebrew/test/test/prefix_formula_test.rb b/Library/Homebrew/test/test/prefix_formula_test.rb
index e51de2b6f0..eb5970d3e2 100644
--- a/Library/Homebrew/test/test/prefix_formula_test.rb
+++ b/Library/Homebrew/test/test/prefix_formula_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPrefixFormula < IntegrationCommandTestCase
   def test_prefix_formula
diff --git a/Library/Homebrew/test/test/prefix_test.rb b/Library/Homebrew/test/test/prefix_test.rb
index 1b21148078..a3ae755426 100644
--- a/Library/Homebrew/test/test/prefix_test.rb
+++ b/Library/Homebrew/test/test/prefix_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPrefix < IntegrationCommandTestCase
   def test_prefix
diff --git a/Library/Homebrew/test/test/prune_test.rb b/Library/Homebrew/test/test/prune_test.rb
index b810621123..8fa5df7b7f 100644
--- a/Library/Homebrew/test/test/prune_test.rb
+++ b/Library/Homebrew/test/test/prune_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPrune < IntegrationCommandTestCase
   def test_prune
diff --git a/Library/Homebrew/test/test/pull_offline_test.rb b/Library/Homebrew/test/test/pull_offline_test.rb
index 1429ca62e3..c9d46cd74b 100644
--- a/Library/Homebrew/test/test/pull_offline_test.rb
+++ b/Library/Homebrew/test/test/pull_offline_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPullOffline < IntegrationCommandTestCase
   def test_pull_offline
diff --git a/Library/Homebrew/test/test/pull_test.rb b/Library/Homebrew/test/test/pull_test.rb
index f772454bab..445d73cb18 100644
--- a/Library/Homebrew/test/test/pull_test.rb
+++ b/Library/Homebrew/test/test/pull_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestPull < IntegrationCommandTestCase
   def test_pull
diff --git a/Library/Homebrew/test/test/readall_test.rb b/Library/Homebrew/test/test/readall_test.rb
index cbb304ca1b..3eec79dd8b 100644
--- a/Library/Homebrew/test/test/readall_test.rb
+++ b/Library/Homebrew/test/test/readall_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestReadall < IntegrationCommandTestCase
   def test_readall
diff --git a/Library/Homebrew/test/test/reinstall_pinned_test.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb
index 36f5cfd74b..80f5518ea9 100644
--- a/Library/Homebrew/test/test/reinstall_pinned_test.rb
+++ b/Library/Homebrew/test/test/reinstall_pinned_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestReinstallPinned < IntegrationCommandTestCase
   def test_reinstall_pinned
diff --git a/Library/Homebrew/test/test/reinstall_test.rb b/Library/Homebrew/test/test/reinstall_test.rb
index 5018301027..73877b35d5 100644
--- a/Library/Homebrew/test/test/reinstall_test.rb
+++ b/Library/Homebrew/test/test/reinstall_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestReinstall < IntegrationCommandTestCase
   def test_reinstall
diff --git a/Library/Homebrew/test/test/repository_test.rb b/Library/Homebrew/test/test/repository_test.rb
index 352ab1d42b..77967a58da 100644
--- a/Library/Homebrew/test/test/repository_test.rb
+++ b/Library/Homebrew/test/test/repository_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestRepository < IntegrationCommandTestCase
   def test_repository
diff --git a/Library/Homebrew/test/test/search_test.rb b/Library/Homebrew/test/test/search_test.rb
index 95e555bf24..70b6f01fb1 100644
--- a/Library/Homebrew/test/test/search_test.rb
+++ b/Library/Homebrew/test/test/search_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestSearch < IntegrationCommandTestCase
   def test_search
diff --git a/Library/Homebrew/test/test/services_test.rb b/Library/Homebrew/test/test/services_test.rb
index 94fba4675f..280aeb9f42 100644
--- a/Library/Homebrew/test/test/services_test.rb
+++ b/Library/Homebrew/test/test/services_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestServices < IntegrationCommandTestCase
   def test_services
diff --git a/Library/Homebrew/test/test/sh_test.rb b/Library/Homebrew/test/test/sh_test.rb
index 67593b17e4..48fcdc54ab 100644
--- a/Library/Homebrew/test/test/sh_test.rb
+++ b/Library/Homebrew/test/test/sh_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestSh < IntegrationCommandTestCase
   def test_sh
diff --git a/Library/Homebrew/test/test/switch_test.rb b/Library/Homebrew/test/test/switch_test.rb
index 766d244940..af1926c39e 100644
--- a/Library/Homebrew/test/test/switch_test.rb
+++ b/Library/Homebrew/test/test/switch_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestSwitch < IntegrationCommandTestCase
   def test_switch
diff --git a/Library/Homebrew/test/test/tap_new_test.rb b/Library/Homebrew/test/test/tap_new_test.rb
index 57ad4a08e2..261a334f0f 100644
--- a/Library/Homebrew/test/test/tap_new_test.rb
+++ b/Library/Homebrew/test/test/tap_new_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestTapNew < IntegrationCommandTestCase
   def test_tap_readme
diff --git a/Library/Homebrew/test/test/tap_test.rb b/Library/Homebrew/test/test/tap_test.rb
index 94597cdb3f..b950cd1666 100644
--- a/Library/Homebrew/test/test/tap_test.rb
+++ b/Library/Homebrew/test/test/tap_test.rb
@@ -1,6 +1,5 @@
 require "testing_env"
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestTap < IntegrationCommandTestCase
   def test_tap
diff --git a/Library/Homebrew/test/test/test_formula_test.rb b/Library/Homebrew/test/test/test_formula_test.rb
index cab4db7409..5ad2db9e98 100644
--- a/Library/Homebrew/test/test/test_formula_test.rb
+++ b/Library/Homebrew/test/test/test_formula_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestTestFormula < IntegrationCommandTestCase
   def test_test_formula
diff --git a/Library/Homebrew/test/test/uninstall_test.rb b/Library/Homebrew/test/test/uninstall_test.rb
index ffc6f0db7a..70a6943531 100644
--- a/Library/Homebrew/test/test/uninstall_test.rb
+++ b/Library/Homebrew/test/test/uninstall_test.rb
@@ -1,4 +1,3 @@
-require "test/support/helper/integration_command_test_case"
 require "cmd/uninstall"
 
 class UninstallTests < Homebrew::TestCase
diff --git a/Library/Homebrew/test/test/unlink_test.rb b/Library/Homebrew/test/test/unlink_test.rb
index a307dc638b..6d5cefc678 100644
--- a/Library/Homebrew/test/test/unlink_test.rb
+++ b/Library/Homebrew/test/test/unlink_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestUnlink < IntegrationCommandTestCase
   def test_unlink
diff --git a/Library/Homebrew/test/test/unlinkapps_test.rb b/Library/Homebrew/test/test/unlinkapps_test.rb
index 2dbbd84e91..9d9672199c 100644
--- a/Library/Homebrew/test/test/unlinkapps_test.rb
+++ b/Library/Homebrew/test/test/unlinkapps_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestUnlinkapps < IntegrationCommandTestCase
   def test_unlinkapps
diff --git a/Library/Homebrew/test/test/unpack_test.rb b/Library/Homebrew/test/test/unpack_test.rb
index e044e713ba..bbff6ad1c4 100644
--- a/Library/Homebrew/test/test/unpack_test.rb
+++ b/Library/Homebrew/test/test/unpack_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestUnpack < IntegrationCommandTestCase
   def test_unpack
diff --git a/Library/Homebrew/test/test/upgrade_test.rb b/Library/Homebrew/test/test/upgrade_test.rb
index 7c74ca70e2..f3f5dccc7a 100644
--- a/Library/Homebrew/test/test/upgrade_test.rb
+++ b/Library/Homebrew/test/test/upgrade_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestUpgrade < IntegrationCommandTestCase
   def test_upgrade
diff --git a/Library/Homebrew/test/test/uses_test.rb b/Library/Homebrew/test/test/uses_test.rb
index 494ce4d6e8..2b15554179 100644
--- a/Library/Homebrew/test/test/uses_test.rb
+++ b/Library/Homebrew/test/test/uses_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestUses < IntegrationCommandTestCase
   def test_uses
diff --git a/Library/Homebrew/test/test/version_test.rb b/Library/Homebrew/test/test/version_test.rb
index a783eda690..e7ffbc4f63 100644
--- a/Library/Homebrew/test/test/version_test.rb
+++ b/Library/Homebrew/test/test/version_test.rb
@@ -1,5 +1,4 @@
 require "testing_env"
-require "test/support/helper/integration_command_test_case"
 
 class IntegrationCommandTestVersion < IntegrationCommandTestCase
   def test_version
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index be70b2fe77..e2ba2e4e42 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -18,3 +18,4 @@ rescue LoadError
 end
 
 require "test/support/helper/test_case"
+require "test/support/helper/integration_command_test_case"