Reorder and rename test files.

132 files changed, 54 insertions, 54 deletions

diff --git a/Library/Homebrew/dev-cmd/tests.rb b/Library/Homebrew/dev-cmd/tests.rb
index ee7fa9275..df9a00a16 100644
--- a/Library/Homebrew/dev-cmd/tests.rb
+++ b/Library/Homebrew/dev-cmd/tests.rb
@@ -8,7 +8,7 @@ module Homebrew
   module_function
 
   def tests
-    (HOMEBREW_LIBRARY/"Homebrew").cd do
+    HOMEBREW_LIBRARY_PATH.cd do
       ENV.delete "HOMEBREW_VERBOSE"
       ENV.delete "VERBOSE"
       ENV["HOMEBREW_NO_ANALYTICS_THIS_RUN"] = "1"
@@ -44,8 +44,8 @@ module Homebrew
       # Make it easier to reproduce test runs.
       ENV["SEED"] = ARGV.next if ARGV.include? "--seed"
 
-      files = Dir["test/test_*.rb"]
-      files -= Dir["test/test_os_mac_*.rb"] unless OS.mac?
+      files = Dir.glob("test/test/**/*_test.rb")
+                 .reject { |p| !OS.mac? && p.start_with?("test/test/os/mac/") }
 
       opts = []
       opts << "--serialize-stdout" if ENV["CI"]
@@ -54,16 +54,14 @@ module Homebrew
       args << "--trace" if ARGV.include? "--trace"
 
       if ARGV.value("only")
-        ENV["HOMEBREW_TESTS_ONLY"] = "1"
-        test_name, test_method = ARGV.value("only").split("/", 2)
-        files = ["test/test_#{test_name}.rb"]
+        test_name, test_method = ARGV.value("only").split(":", 2)
+        files = Dir.glob("test/test/{#{test_name},#{test_name}/**/*}_test.rb")
         args << "--name=test_#{test_method}" if test_method
       end
 
       args += ARGV.named.select { |v| v[/^TEST(OPTS)?=/] }
 
-      system "bundle", "exec", "parallel_test", *opts,
-        "--", *args, "--", *files
+      system "bundle", "exec", "parallel_test", *opts, "--", *args, "--", *files
 
       Homebrew.failed = !$?.success?
 
diff --git a/Library/Homebrew/test/test_ARGV.rb b/Library/Homebrew/test/test/ARGV_test.rb
index 6805e0c62..6805e0c62 100644
--- a/Library/Homebrew/test/test_ARGV.rb
+++ b/Library/Homebrew/test/test/ARGV_test.rb
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test/ENV_test.rb
index e38c75c6e..e38c75c6e 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test/ENV_test.rb
diff --git a/Library/Homebrew/test/test_analytics.rb b/Library/Homebrew/test/test/analytics_test.rb
index 00e0593db..00e0593db 100644
--- a/Library/Homebrew/test/test_analytics.rb
+++ b/Library/Homebrew/test/test/analytics_test.rb
diff --git a/Library/Homebrew/test/test_audit.rb b/Library/Homebrew/test/test/audit_test.rb
index 2725f906e..2725f906e 100644
--- a/Library/Homebrew/test/test_audit.rb
+++ b/Library/Homebrew/test/test/audit_test.rb
diff --git a/Library/Homebrew/test/test_bash.rb b/Library/Homebrew/test/test/bash_test.rb
index ff418c787..ff418c787 100644
--- a/Library/Homebrew/test/test_bash.rb
+++ b/Library/Homebrew/test/test/bash_test.rb
diff --git a/Library/Homebrew/test/test_blacklist.rb b/Library/Homebrew/test/test/blacklist_test.rb
index 585a35484..585a35484 100644
--- a/Library/Homebrew/test/test_blacklist.rb
+++ b/Library/Homebrew/test/test/blacklist_test.rb
diff --git a/Library/Homebrew/test/test_bottle_collector.rb b/Library/Homebrew/test/test/bottle_collector_test.rb
index d75e29ec8..d75e29ec8 100644
--- a/Library/Homebrew/test/test_bottle_collector.rb
+++ b/Library/Homebrew/test/test/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test_bottle_filename.rb b/Library/Homebrew/test/test/bottle_filename_test.rb
index 6604e7d6a..6604e7d6a 100644
--- a/Library/Homebrew/test/test_bottle_filename.rb
+++ b/Library/Homebrew/test/test/bottle_filename_test.rb
diff --git a/Library/Homebrew/test/test_bottle_hooks.rb b/Library/Homebrew/test/test/bottle_hooks_test.rb
index 3535d80ef..3535d80ef 100644
--- a/Library/Homebrew/test/test_bottle_hooks.rb
+++ b/Library/Homebrew/test/test/bottle_hooks_test.rb
diff --git a/Library/Homebrew/test/test_bottle.rb b/Library/Homebrew/test/test/bottle_test.rb
index 48727cfd9..48727cfd9 100644
--- a/Library/Homebrew/test/test_bottle.rb
+++ b/Library/Homebrew/test/test/bottle_test.rb
diff --git a/Library/Homebrew/test/test_build_environment.rb b/Library/Homebrew/test/test/build_environment_test.rb
index 73a1c95f7..73a1c95f7 100644
--- a/Library/Homebrew/test/test_build_environment.rb
+++ b/Library/Homebrew/test/test/build_environment_test.rb
diff --git a/Library/Homebrew/test/test_build_options.rb b/Library/Homebrew/test/test/build_options_test.rb
index e460d25cc..e460d25cc 100644
--- a/Library/Homebrew/test/test_build_options.rb
+++ b/Library/Homebrew/test/test/build_options_test.rb
diff --git a/Library/Homebrew/test/test_bundle.rb b/Library/Homebrew/test/test/bundle_test.rb
index 6b040df1d..6b040df1d 100644
--- a/Library/Homebrew/test/test_bundle.rb
+++ b/Library/Homebrew/test/test/bundle_test.rb
diff --git a/Library/Homebrew/test/test_cache_formula.rb b/Library/Homebrew/test/test/cache_formula_test.rb
index f4e37e2a2..f4e37e2a2 100644
--- a/Library/Homebrew/test/test_cache_formula.rb
+++ b/Library/Homebrew/test/test/cache_formula_test.rb
diff --git a/Library/Homebrew/test/test_cache.rb b/Library/Homebrew/test/test/cache_test.rb
index cd7a5e2fa..cd7a5e2fa 100644
--- a/Library/Homebrew/test/test_cache.rb
+++ b/Library/Homebrew/test/test/cache_test.rb
diff --git a/Library/Homebrew/test/test_cask.rb b/Library/Homebrew/test/test/cask_test.rb
index 6cae6d54b..6cae6d54b 100644
--- a/Library/Homebrew/test/test_cask.rb
+++ b/Library/Homebrew/test/test/cask_test.rb
diff --git a/Library/Homebrew/test/test_cat.rb b/Library/Homebrew/test/test/cat_test.rb
index 4cfd19c3d..4cfd19c3d 100644
--- a/Library/Homebrew/test/test_cat.rb
+++ b/Library/Homebrew/test/test/cat_test.rb
diff --git a/Library/Homebrew/test/test_caveats.rb b/Library/Homebrew/test/test/caveats_test.rb
index 9eaac5792..9eaac5792 100644
--- a/Library/Homebrew/test/test_caveats.rb
+++ b/Library/Homebrew/test/test/caveats_test.rb
diff --git a/Library/Homebrew/test/test_cellar_formula.rb b/Library/Homebrew/test/test/cellar_formula_test.rb
index 7c458be9d..7c458be9d 100644
--- a/Library/Homebrew/test/test_cellar_formula.rb
+++ b/Library/Homebrew/test/test/cellar_formula_test.rb
diff --git a/Library/Homebrew/test/test_cellar.rb b/Library/Homebrew/test/test/cellar_test.rb
index b793c5342..b793c5342 100644
--- a/Library/Homebrew/test/test_cellar.rb
+++ b/Library/Homebrew/test/test/cellar_test.rb
diff --git a/Library/Homebrew/test/test_checksum.rb b/Library/Homebrew/test/test/checksum_test.rb
index 5505f6824..5505f6824 100644
--- a/Library/Homebrew/test/test_checksum.rb
+++ b/Library/Homebrew/test/test/checksum_test.rb
diff --git a/Library/Homebrew/test/test_checksum_verification.rb b/Library/Homebrew/test/test/checksum_verification_test.rb
index e25d08b83..e25d08b83 100644
--- a/Library/Homebrew/test/test_checksum_verification.rb
+++ b/Library/Homebrew/test/test/checksum_verification_test.rb
diff --git a/Library/Homebrew/test/test_cleaner.rb b/Library/Homebrew/test/test/cleaner_test.rb
index 450a78d86..450a78d86 100644
--- a/Library/Homebrew/test/test_cleaner.rb
+++ b/Library/Homebrew/test/test/cleaner_test.rb
diff --git a/Library/Homebrew/test/test_cleanup.rb b/Library/Homebrew/test/test/cleanup_test.rb
index dffcd12f2..dffcd12f2 100644
--- a/Library/Homebrew/test/test_cleanup.rb
+++ b/Library/Homebrew/test/test/cleanup_test.rb
diff --git a/Library/Homebrew/test/test_command.rb b/Library/Homebrew/test/test/command_test.rb
index d05184631..d05184631 100644
--- a/Library/Homebrew/test/test_command.rb
+++ b/Library/Homebrew/test/test/command_test.rb
diff --git a/Library/Homebrew/test/test_commands.rb b/Library/Homebrew/test/test/commands_test.rb
index ef138049c..ef138049c 100644
--- a/Library/Homebrew/test/test_commands.rb
+++ b/Library/Homebrew/test/test/commands_test.rb
diff --git a/Library/Homebrew/test/test_compiler_failure.rb b/Library/Homebrew/test/test/compiler_failure_test.rb
index c0b74d128..c0b74d128 100644
--- a/Library/Homebrew/test/test_compiler_failure.rb
+++ b/Library/Homebrew/test/test/compiler_failure_test.rb
diff --git a/Library/Homebrew/test/test_compiler_selector.rb b/Library/Homebrew/test/test/compiler_selector_test.rb
index b1591bdbe..b1591bdbe 100644
--- a/Library/Homebrew/test/test_compiler_selector.rb
+++ b/Library/Homebrew/test/test/compiler_selector_test.rb
diff --git a/Library/Homebrew/test/test_config.rb b/Library/Homebrew/test/test/config_test.rb
index 33a293735..33a293735 100644
--- a/Library/Homebrew/test/test_config.rb
+++ b/Library/Homebrew/test/test/config_test.rb
diff --git a/Library/Homebrew/test/test_create.rb b/Library/Homebrew/test/test/create_test.rb
index bb1a2cd2a..5f194ea02 100644
--- a/Library/Homebrew/test/test_create.rb
+++ b/Library/Homebrew/test/test/create_test.rb
@@ -2,7 +2,7 @@ require "helper/integration_command_test_case"
 
 class IntegrationCommandTestCreate < IntegrationCommandTestCase
   def test_create
-    url = "file://#{File.expand_path("..", __FILE__)}/tarballs/testball-0.1.tbz"
+    url = "file://#{TEST_DIRECTORY}/tarballs/testball-0.1.tbz"
     cmd("create", url, "HOMEBREW_EDITOR" => "/bin/cat")
 
     formula_file = CoreTap.new.formula_dir/"testball.rb"
diff --git a/Library/Homebrew/test/test_custom_command.rb b/Library/Homebrew/test/test/custom_command_test.rb
index bc27e2121..bc27e2121 100644
--- a/Library/Homebrew/test/test_custom_command.rb
+++ b/Library/Homebrew/test/test/custom_command_test.rb
diff --git a/Library/Homebrew/test/test_dependencies.rb b/Library/Homebrew/test/test/dependencies_test.rb
index db3b78226..db3b78226 100644
--- a/Library/Homebrew/test/test_dependencies.rb
+++ b/Library/Homebrew/test/test/dependencies_test.rb
diff --git a/Library/Homebrew/test/test_dependency_collector.rb b/Library/Homebrew/test/test/dependency_collector_test.rb
index 1c7f70118..1c7f70118 100644
--- a/Library/Homebrew/test/test_dependency_collector.rb
+++ b/Library/Homebrew/test/test/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test_dependency_expansion.rb b/Library/Homebrew/test/test/dependency_expansion_test.rb
index 9d6de35e2..9d6de35e2 100644
--- a/Library/Homebrew/test/test_dependency_expansion.rb
+++ b/Library/Homebrew/test/test/dependency_expansion_test.rb
diff --git a/Library/Homebrew/test/test_dependency.rb b/Library/Homebrew/test/test/dependency_test.rb
index 65255995e..65255995e 100644
--- a/Library/Homebrew/test/test_dependency.rb
+++ b/Library/Homebrew/test/test/dependency_test.rb
diff --git a/Library/Homebrew/test/test_deps.rb b/Library/Homebrew/test/test/deps_test.rb
index 83cc9aa6a..83cc9aa6a 100644
--- a/Library/Homebrew/test/test_deps.rb
+++ b/Library/Homebrew/test/test/deps_test.rb
diff --git a/Library/Homebrew/test/test_desc.rb b/Library/Homebrew/test/test/desc_test.rb
index 075ea991a..075ea991a 100644
--- a/Library/Homebrew/test/test_desc.rb
+++ b/Library/Homebrew/test/test/desc_test.rb
diff --git a/Library/Homebrew/test/test_descriptions.rb b/Library/Homebrew/test/test/descriptions_test.rb
index de38fdbd1..de38fdbd1 100644
--- a/Library/Homebrew/test/test_descriptions.rb
+++ b/Library/Homebrew/test/test/descriptions_test.rb
diff --git a/Library/Homebrew/test/test_diagnostic.rb b/Library/Homebrew/test/test/diagnostic_test.rb
index aa2e44cfc..aa2e44cfc 100644
--- a/Library/Homebrew/test/test_diagnostic.rb
+++ b/Library/Homebrew/test/test/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test_doctor.rb b/Library/Homebrew/test/test/doctor_test.rb
index ccb909dce..ccb909dce 100644
--- a/Library/Homebrew/test/test_doctor.rb
+++ b/Library/Homebrew/test/test/doctor_test.rb
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test/download_strategies_test.rb
index 87218fb12..87218fb12 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test/download_strategies_test.rb
diff --git a/Library/Homebrew/test/test_edit.rb b/Library/Homebrew/test/test/edit_test.rb
index 8d1437173..8d1437173 100644
--- a/Library/Homebrew/test/test_edit.rb
+++ b/Library/Homebrew/test/test/edit_test.rb
diff --git a/Library/Homebrew/test/test_exceptions.rb b/Library/Homebrew/test/test/exceptions_test.rb
index 689531c6e..689531c6e 100644
--- a/Library/Homebrew/test/test_exceptions.rb
+++ b/Library/Homebrew/test/test/exceptions_test.rb
diff --git a/Library/Homebrew/test/test_fetch.rb b/Library/Homebrew/test/test/fetch_test.rb
index 7b57c6246..7b57c6246 100644
--- a/Library/Homebrew/test/test_fetch.rb
+++ b/Library/Homebrew/test/test/fetch_test.rb
diff --git a/Library/Homebrew/test/test_formula_installer_bottle.rb b/Library/Homebrew/test/test/formula_installer_bottle_test.rb
index d83c856b7..d83c856b7 100644
--- a/Library/Homebrew/test/test_formula_installer_bottle.rb
+++ b/Library/Homebrew/test/test/formula_installer_bottle_test.rb
diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test/formula_installer_test.rb
index 18bd910a6..18bd910a6 100644
--- a/Library/Homebrew/test/test_formula_installer.rb
+++ b/Library/Homebrew/test/test/formula_installer_test.rb
diff --git a/Library/Homebrew/test/test_formula_lock.rb b/Library/Homebrew/test/test/formula_lock_test.rb
index 80ee9dd25..80ee9dd25 100644
--- a/Library/Homebrew/test/test_formula_lock.rb
+++ b/Library/Homebrew/test/test/formula_lock_test.rb
diff --git a/Library/Homebrew/test/test_formula_pin.rb b/Library/Homebrew/test/test/formula_pin_test.rb
index 297d7703e..297d7703e 100644
--- a/Library/Homebrew/test/test_formula_pin.rb
+++ b/Library/Homebrew/test/test/formula_pin_test.rb
diff --git a/Library/Homebrew/test/test_formula_spec_selection.rb b/Library/Homebrew/test/test/formula_spec_selection_test.rb
index 7148df173..7148df173 100644
--- a/Library/Homebrew/test/test_formula_spec_selection.rb
+++ b/Library/Homebrew/test/test/formula_spec_selection_test.rb
diff --git a/Library/Homebrew/test/test_formula_support.rb b/Library/Homebrew/test/test/formula_support_test.rb
index c0a79f950..c0a79f950 100644
--- a/Library/Homebrew/test/test_formula_support.rb
+++ b/Library/Homebrew/test/test/formula_support_test.rb
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test/formula_test.rb
index 4aa835590..4aa835590 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test/formula_test.rb
diff --git a/Library/Homebrew/test/test_formula_validation.rb b/Library/Homebrew/test/test/formula_validation_test.rb
index c40eb6733..c40eb6733 100644
--- a/Library/Homebrew/test/test_formula_validation.rb
+++ b/Library/Homebrew/test/test/formula_validation_test.rb
diff --git a/Library/Homebrew/test/test_formulary.rb b/Library/Homebrew/test/test/formulary_test.rb
index c545ff84d..690ff089a 100644
--- a/Library/Homebrew/test/test_formulary.rb
+++ b/Library/Homebrew/test/test/formulary_test.rb
@@ -18,7 +18,7 @@ class FormularyFactoryTest < Homebrew::TestCase
   def setup
     @name = "testball_bottle"
     @path = CoreTap.new.formula_dir/"#{@name}.rb"
-    @bottle_dir = Pathname.new("#{File.expand_path("..", __FILE__)}/bottles")
+    @bottle_dir = Pathname.new("#{TEST_DIRECTORY}/bottles")
     @bottle = @bottle_dir/"testball_bottle-0.1.#{Utils::Bottles.tag}.bottle.tar.gz"
     @path.write <<-EOS.undent
       class #{Formulary.class_s(@name)} < Formula
diff --git a/Library/Homebrew/test/test_gpg2_requirement.rb b/Library/Homebrew/test/test/gpg2_requirement_test.rb
index fa7fc9ea4..fa7fc9ea4 100644
--- a/Library/Homebrew/test/test_gpg2_requirement.rb
+++ b/Library/Homebrew/test/test/gpg2_requirement_test.rb
diff --git a/Library/Homebrew/test/test_gpg.rb b/Library/Homebrew/test/test/gpg_test.rb
index 0374bdab4..0374bdab4 100644
--- a/Library/Homebrew/test/test_gpg.rb
+++ b/Library/Homebrew/test/test/gpg_test.rb
diff --git a/Library/Homebrew/test/test_hardware.rb b/Library/Homebrew/test/test/hardware_test.rb
index 2bea5387d..2bea5387d 100644
--- a/Library/Homebrew/test/test_hardware.rb
+++ b/Library/Homebrew/test/test/hardware_test.rb
diff --git a/Library/Homebrew/test/test_help.rb b/Library/Homebrew/test/test/help_test.rb
index 9c14f9b78..9c14f9b78 100644
--- a/Library/Homebrew/test/test_help.rb
+++ b/Library/Homebrew/test/test/help_test.rb
diff --git a/Library/Homebrew/test/test_home.rb b/Library/Homebrew/test/test/home_test.rb
index 9c26353be..9c26353be 100644
--- a/Library/Homebrew/test/test_home.rb
+++ b/Library/Homebrew/test/test/home_test.rb
diff --git a/Library/Homebrew/test/test_info.rb b/Library/Homebrew/test/test/info_test.rb
index 35f9183e1..35f9183e1 100644
--- a/Library/Homebrew/test/test_info.rb
+++ b/Library/Homebrew/test/test/info_test.rb
diff --git a/Library/Homebrew/test/test_inreplace.rb b/Library/Homebrew/test/test/inreplace_test.rb
index 0e62f9d3f..0e62f9d3f 100644
--- a/Library/Homebrew/test/test_inreplace.rb
+++ b/Library/Homebrew/test/test/inreplace_test.rb
diff --git a/Library/Homebrew/test/test_install.rb b/Library/Homebrew/test/test/install_test.rb
index 7135dddb2..7135dddb2 100644
--- a/Library/Homebrew/test/test_install.rb
+++ b/Library/Homebrew/test/test/install_test.rb
diff --git a/Library/Homebrew/test/test_irb.rb b/Library/Homebrew/test/test/irb_test.rb
index bf35b6524..bf35b6524 100644
--- a/Library/Homebrew/test/test_irb.rb
+++ b/Library/Homebrew/test/test/irb_test.rb
diff --git a/Library/Homebrew/test/test_json.rb b/Library/Homebrew/test/test/json_test.rb
index 14d2f2b4c..14d2f2b4c 100644
--- a/Library/Homebrew/test/test_json.rb
+++ b/Library/Homebrew/test/test/json_test.rb
diff --git a/Library/Homebrew/test/test_keg.rb b/Library/Homebrew/test/test/keg_test.rb
index fdc739c9d..fdc739c9d 100644
--- a/Library/Homebrew/test/test_keg.rb
+++ b/Library/Homebrew/test/test/keg_test.rb
diff --git a/Library/Homebrew/test/test_language_go.rb b/Library/Homebrew/test/test/language_go_test.rb
index 692a5d2cc..692a5d2cc 100644
--- a/Library/Homebrew/test/test_language_go.rb
+++ b/Library/Homebrew/test/test/language_go_test.rb
diff --git a/Library/Homebrew/test/test_language_module_requirement.rb b/Library/Homebrew/test/test/language_module_requirement_test.rb
index dfa992287..dfa992287 100644
--- a/Library/Homebrew/test/test_language_module_requirement.rb
+++ b/Library/Homebrew/test/test/language_module_requirement_test.rb
diff --git a/Library/Homebrew/test/test_language_python.rb b/Library/Homebrew/test/test/language_python_test.rb
index d1e3867f7..d1e3867f7 100644
--- a/Library/Homebrew/test/test_language_python.rb
+++ b/Library/Homebrew/test/test/language_python_test.rb
diff --git a/Library/Homebrew/test/test_leaves.rb b/Library/Homebrew/test/test/leaves_test.rb
index 2a9bbadd9..2a9bbadd9 100644
--- a/Library/Homebrew/test/test_leaves.rb
+++ b/Library/Homebrew/test/test/leaves_test.rb
diff --git a/Library/Homebrew/test/test_link.rb b/Library/Homebrew/test/test/link_test.rb
index 3f0507072..3f0507072 100644
--- a/Library/Homebrew/test/test_link.rb
+++ b/Library/Homebrew/test/test/link_test.rb
diff --git a/Library/Homebrew/test/test_linkapps.rb b/Library/Homebrew/test/test/linkapps_test.rb
index b7c4cb811..b7c4cb811 100644
--- a/Library/Homebrew/test/test_linkapps.rb
+++ b/Library/Homebrew/test/test/linkapps_test.rb
diff --git a/Library/Homebrew/test/test_list.rb b/Library/Homebrew/test/test/list_test.rb
index 1ffdb4528..1ffdb4528 100644
--- a/Library/Homebrew/test/test_list.rb
+++ b/Library/Homebrew/test/test/list_test.rb
diff --git a/Library/Homebrew/test/test_log_formula.rb b/Library/Homebrew/test/test/log_formula_test.rb
index 34509bf72..34509bf72 100644
--- a/Library/Homebrew/test/test_log_formula.rb
+++ b/Library/Homebrew/test/test/log_formula_test.rb
diff --git a/Library/Homebrew/test/test_log.rb b/Library/Homebrew/test/test/log_test.rb
index b20a098fd..b20a098fd 100644
--- a/Library/Homebrew/test/test_log.rb
+++ b/Library/Homebrew/test/test/log_test.rb
diff --git a/Library/Homebrew/test/test_migrate.rb b/Library/Homebrew/test/test/migrate_test.rb
index 53b32777a..53b32777a 100644
--- a/Library/Homebrew/test/test_migrate.rb
+++ b/Library/Homebrew/test/test/migrate_test.rb
diff --git a/Library/Homebrew/test/test_migrator.rb b/Library/Homebrew/test/test/migrator_test.rb
index cefb8b7a3..cefb8b7a3 100644
--- a/Library/Homebrew/test/test_migrator.rb
+++ b/Library/Homebrew/test/test/migrator_test.rb
diff --git a/Library/Homebrew/test/test_missing.rb b/Library/Homebrew/test/test/missing_test.rb
index 565f413da..565f413da 100644
--- a/Library/Homebrew/test/test_missing.rb
+++ b/Library/Homebrew/test/test/missing_test.rb
diff --git a/Library/Homebrew/test/test_mpi_requirement.rb b/Library/Homebrew/test/test/mpi_requirement_test.rb
index e0f97e8ee..e0f97e8ee 100644
--- a/Library/Homebrew/test/test_mpi_requirement.rb
+++ b/Library/Homebrew/test/test/mpi_requirement_test.rb
diff --git a/Library/Homebrew/test/test_options.rb b/Library/Homebrew/test/test/options_test.rb
index bfde7a9b6..bfde7a9b6 100644
--- a/Library/Homebrew/test/test_options.rb
+++ b/Library/Homebrew/test/test/options_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_blacklist.rb b/Library/Homebrew/test/test/os/mac/blacklist_test.rb
index 26dd84ed9..26dd84ed9 100644
--- a/Library/Homebrew/test/test_os_mac_blacklist.rb
+++ b/Library/Homebrew/test/test/os/mac/blacklist_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_bottle_collector.rb b/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
index 2f88050ae..2f88050ae 100644
--- a/Library/Homebrew/test/test_os_mac_bottle_collector.rb
+++ b/Library/Homebrew/test/test/os/mac/bottle_collector_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_bottle_tag.rb b/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
index 996bd4d53..996bd4d53 100644
--- a/Library/Homebrew/test/test_os_mac_bottle_tag.rb
+++ b/Library/Homebrew/test/test/os/mac/bottle_tag_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_dependency_collector.rb b/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
index 4fdf3ebe4..4fdf3ebe4 100644
--- a/Library/Homebrew/test/test_os_mac_dependency_collector.rb
+++ b/Library/Homebrew/test/test/os/mac/dependency_collector_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_diagnostic.rb b/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
index 655aa1d46..655aa1d46 100644
--- a/Library/Homebrew/test/test_os_mac_diagnostic.rb
+++ b/Library/Homebrew/test/test/os/mac/diagnostic_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_keg.rb b/Library/Homebrew/test/test/os/mac/keg_test.rb
index e79cbc921..e79cbc921 100644
--- a/Library/Homebrew/test/test_os_mac_keg.rb
+++ b/Library/Homebrew/test/test/os/mac/keg_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_language.rb b/Library/Homebrew/test/test/os/mac/language_test.rb
index e328db5e0..e328db5e0 100644
--- a/Library/Homebrew/test/test_os_mac_language.rb
+++ b/Library/Homebrew/test/test/os/mac/language_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_mach.rb b/Library/Homebrew/test/test/os/mac/mach_test.rb
index 404a21d60..404a21d60 100644
--- a/Library/Homebrew/test/test_os_mac_mach.rb
+++ b/Library/Homebrew/test/test/os/mac/mach_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_version.rb b/Library/Homebrew/test/test/os/mac/version_test.rb
index f702c7097..f702c7097 100644
--- a/Library/Homebrew/test/test_os_mac_version.rb
+++ b/Library/Homebrew/test/test/os/mac/version_test.rb
diff --git a/Library/Homebrew/test/test_os_mac_x11_requirement.rb b/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
index 102937cb5..102937cb5 100644
--- a/Library/Homebrew/test/test_os_mac_x11_requirement.rb
+++ b/Library/Homebrew/test/test/os/mac/x11_requirement_test.rb
diff --git a/Library/Homebrew/test/test_outdated.rb b/Library/Homebrew/test/test/outdated_test.rb
index cc0f024c8..cc0f024c8 100644
--- a/Library/Homebrew/test/test_outdated.rb
+++ b/Library/Homebrew/test/test/outdated_test.rb
diff --git a/Library/Homebrew/test/test_patch.rb b/Library/Homebrew/test/test/patch_test.rb
index 62624720e..62624720e 100644
--- a/Library/Homebrew/test/test_patch.rb
+++ b/Library/Homebrew/test/test/patch_test.rb
diff --git a/Library/Homebrew/test/test_patching.rb b/Library/Homebrew/test/test/patching_test.rb
index 18b848b10..18b848b10 100644
--- a/Library/Homebrew/test/test_patching.rb
+++ b/Library/Homebrew/test/test/patching_test.rb
diff --git a/Library/Homebrew/test/test_pathname.rb b/Library/Homebrew/test/test/pathname_test.rb
index 2f6360719..2f6360719 100644
--- a/Library/Homebrew/test/test_pathname.rb
+++ b/Library/Homebrew/test/test/pathname_test.rb
diff --git a/Library/Homebrew/test/test_pin_unpin.rb b/Library/Homebrew/test/test/pin_unpin_test.rb
index 37682d45e..37682d45e 100644
--- a/Library/Homebrew/test/test_pin_unpin.rb
+++ b/Library/Homebrew/test/test/pin_unpin_test.rb
diff --git a/Library/Homebrew/test/test_pkg_version.rb b/Library/Homebrew/test/test/pkg_version_test.rb
index ff7896f8b..ff7896f8b 100644
--- a/Library/Homebrew/test/test_pkg_version.rb
+++ b/Library/Homebrew/test/test/pkg_version_test.rb
diff --git a/Library/Homebrew/test/test_prefix_formula.rb b/Library/Homebrew/test/test/prefix_formula_test.rb
index d76a966d7..d76a966d7 100644
--- a/Library/Homebrew/test/test_prefix_formula.rb
+++ b/Library/Homebrew/test/test/prefix_formula_test.rb
diff --git a/Library/Homebrew/test/test_prefix.rb b/Library/Homebrew/test/test/prefix_test.rb
index 4aa63fa07..4aa63fa07 100644
--- a/Library/Homebrew/test/test_prefix.rb
+++ b/Library/Homebrew/test/test/prefix_test.rb
diff --git a/Library/Homebrew/test/test_prune.rb b/Library/Homebrew/test/test/prune_test.rb
index 293a3746d..293a3746d 100644
--- a/Library/Homebrew/test/test_prune.rb
+++ b/Library/Homebrew/test/test/prune_test.rb
diff --git a/Library/Homebrew/test/test_pull_offline.rb b/Library/Homebrew/test/test/pull_offline_test.rb
index 2716af346..2716af346 100644
--- a/Library/Homebrew/test/test_pull_offline.rb
+++ b/Library/Homebrew/test/test/pull_offline_test.rb
diff --git a/Library/Homebrew/test/test_pull.rb b/Library/Homebrew/test/test/pull_test.rb
index 9707ff8a8..9707ff8a8 100644
--- a/Library/Homebrew/test/test_pull.rb
+++ b/Library/Homebrew/test/test/pull_test.rb
diff --git a/Library/Homebrew/test/test_readall.rb b/Library/Homebrew/test/test/readall_test.rb
index d0c078e49..d0c078e49 100644
--- a/Library/Homebrew/test/test_readall.rb
+++ b/Library/Homebrew/test/test/readall_test.rb
diff --git a/Library/Homebrew/test/test_reinstall_pinned.rb b/Library/Homebrew/test/test/reinstall_pinned_test.rb
index c9cb8a849..c9cb8a849 100644
--- a/Library/Homebrew/test/test_reinstall_pinned.rb
+++ b/Library/Homebrew/test/test/reinstall_pinned_test.rb
diff --git a/Library/Homebrew/test/test_reinstall.rb b/Library/Homebrew/test/test/reinstall_test.rb
index d07a96051..d07a96051 100644
--- a/Library/Homebrew/test/test_reinstall.rb
+++ b/Library/Homebrew/test/test/reinstall_test.rb
diff --git a/Library/Homebrew/test/test_repository.rb b/Library/Homebrew/test/test/repository_test.rb
index 2029876ad..2029876ad 100644
--- a/Library/Homebrew/test/test_repository.rb
+++ b/Library/Homebrew/test/test/repository_test.rb
diff --git a/Library/Homebrew/test/test_requirement.rb b/Library/Homebrew/test/test/requirement_test.rb
index 580d42bfa..580d42bfa 100644
--- a/Library/Homebrew/test/test_requirement.rb
+++ b/Library/Homebrew/test/test/requirement_test.rb
diff --git a/Library/Homebrew/test/test_resource.rb b/Library/Homebrew/test/test/resource_test.rb
index c1b526cb2..c1b526cb2 100644
--- a/Library/Homebrew/test/test_resource.rb
+++ b/Library/Homebrew/test/test/resource_test.rb
diff --git a/Library/Homebrew/test/test_sandbox.rb b/Library/Homebrew/test/test/sandbox_test.rb
index 2a062cb10..2a062cb10 100644
--- a/Library/Homebrew/test/test_sandbox.rb
+++ b/Library/Homebrew/test/test/sandbox_test.rb
diff --git a/Library/Homebrew/test/test_search_remote_tap.rb b/Library/Homebrew/test/test/search_remote_tap_test.rb
index 9dd9ee654..9dd9ee654 100644
--- a/Library/Homebrew/test/test_search_remote_tap.rb
+++ b/Library/Homebrew/test/test/search_remote_tap_test.rb
diff --git a/Library/Homebrew/test/test_search.rb b/Library/Homebrew/test/test/search_test.rb
index 8310d1c2b..8310d1c2b 100644
--- a/Library/Homebrew/test/test_search.rb
+++ b/Library/Homebrew/test/test/search_test.rb
diff --git a/Library/Homebrew/test/test_services.rb b/Library/Homebrew/test/test/services_test.rb
index b5ccb7c77..b5ccb7c77 100644
--- a/Library/Homebrew/test/test_services.rb
+++ b/Library/Homebrew/test/test/services_test.rb
diff --git a/Library/Homebrew/test/test_sh.rb b/Library/Homebrew/test/test/sh_test.rb
index 449b7b5b3..449b7b5b3 100644
--- a/Library/Homebrew/test/test_sh.rb
+++ b/Library/Homebrew/test/test/sh_test.rb
diff --git a/Library/Homebrew/test/test_shell.rb b/Library/Homebrew/test/test/shell_test.rb
index 877acb5c8..877acb5c8 100644
--- a/Library/Homebrew/test/test_shell.rb
+++ b/Library/Homebrew/test/test/shell_test.rb
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test/software_spec_test.rb
index d9226f8c3..d9226f8c3 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test/software_spec_test.rb
diff --git a/Library/Homebrew/test/test_stdlib.rb b/Library/Homebrew/test/test/stdlib_test.rb
index ee53e7c8c..ee53e7c8c 100644
--- a/Library/Homebrew/test/test_stdlib.rb
+++ b/Library/Homebrew/test/test/stdlib_test.rb
diff --git a/Library/Homebrew/test/test_string.rb b/Library/Homebrew/test/test/string_test.rb
index 497c4badb..497c4badb 100644
--- a/Library/Homebrew/test/test_string.rb
+++ b/Library/Homebrew/test/test/string_test.rb
diff --git a/Library/Homebrew/test/test_switch.rb b/Library/Homebrew/test/test/switch_test.rb
index 88fdf85b9..88fdf85b9 100644
--- a/Library/Homebrew/test/test_switch.rb
+++ b/Library/Homebrew/test/test/switch_test.rb
diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test/tab_test.rb
index 2c756cf68..2c756cf68 100644
--- a/Library/Homebrew/test/test_tab.rb
+++ b/Library/Homebrew/test/test/tab_test.rb
diff --git a/Library/Homebrew/test/test_tap_new.rb b/Library/Homebrew/test/test/tap_new_test.rb
index 636024b0a..636024b0a 100644
--- a/Library/Homebrew/test/test_tap_new.rb
+++ b/Library/Homebrew/test/test/tap_new_test.rb
diff --git a/Library/Homebrew/test/test_tap.rb b/Library/Homebrew/test/test/tap_test.rb
index 71836aee9..71836aee9 100644
--- a/Library/Homebrew/test/test_tap.rb
+++ b/Library/Homebrew/test/test/tap_test.rb
diff --git a/Library/Homebrew/test/test_test_formula.rb b/Library/Homebrew/test/test/test_formula_test.rb
index b3889d6a2..b3889d6a2 100644
--- a/Library/Homebrew/test/test_test_formula.rb
+++ b/Library/Homebrew/test/test/test_formula_test.rb
diff --git a/Library/Homebrew/test/test_uninstall.rb b/Library/Homebrew/test/test/uninstall_test.rb
index d86db0e80..d86db0e80 100644
--- a/Library/Homebrew/test/test_uninstall.rb
+++ b/Library/Homebrew/test/test/uninstall_test.rb
diff --git a/Library/Homebrew/test/test_unlink.rb b/Library/Homebrew/test/test/unlink_test.rb
index 091bd8c45..091bd8c45 100644
--- a/Library/Homebrew/test/test_unlink.rb
+++ b/Library/Homebrew/test/test/unlink_test.rb
diff --git a/Library/Homebrew/test/test_unlinkapps.rb b/Library/Homebrew/test/test/unlinkapps_test.rb
index 2de4e3ff8..2de4e3ff8 100644
--- a/Library/Homebrew/test/test_unlinkapps.rb
+++ b/Library/Homebrew/test/test/unlinkapps_test.rb
diff --git a/Library/Homebrew/test/test_unpack.rb b/Library/Homebrew/test/test/unpack_test.rb
index de1452a29..de1452a29 100644
--- a/Library/Homebrew/test/test_unpack.rb
+++ b/Library/Homebrew/test/test/unpack_test.rb
diff --git a/Library/Homebrew/test/test_update_report.rb b/Library/Homebrew/test/test/update_report_test.rb
index 6b6cec6ce..6b6cec6ce 100644
--- a/Library/Homebrew/test/test_update_report.rb
+++ b/Library/Homebrew/test/test/update_report_test.rb
diff --git a/Library/Homebrew/test/test_upgrade.rb b/Library/Homebrew/test/test/upgrade_test.rb
index 73618293b..73618293b 100644
--- a/Library/Homebrew/test/test_upgrade.rb
+++ b/Library/Homebrew/test/test/upgrade_test.rb
diff --git a/Library/Homebrew/test/test_uses.rb b/Library/Homebrew/test/test/uses_test.rb
index b0e79ef2d..b0e79ef2d 100644
--- a/Library/Homebrew/test/test_uses.rb
+++ b/Library/Homebrew/test/test/uses_test.rb
diff --git a/Library/Homebrew/test/test/utils/tty_test.rb b/Library/Homebrew/test/test/utils/tty_test.rb
new file mode 100644
index 000000000..09f092cbd
--- /dev/null
+++ b/Library/Homebrew/test/test/utils/tty_test.rb
@@ -0,0 +1,46 @@
+require "testing_env"
+require "utils"
+
+class TtyTests < Homebrew::TestCase
+  def test_strip_ansi
+    assert_equal "hello", Tty.strip_ansi("\033\[36;7mhello\033\[0m")
+  end
+
+  def test_width
+    assert_kind_of Integer, Tty.width
+  end
+
+  def test_truncate
+    Tty.stubs(:width).returns 15
+    assert_equal "foobar some", Tty.truncate("foobar something very long")
+    assert_equal "truncate", Tty.truncate("truncate")
+
+    # When the terminal is unsupported, we report 0 width
+    Tty.stubs(:width).returns 0
+    assert_equal "foobar something very long", Tty.truncate("foobar something very long")
+  end
+
+  def test_no_tty_formatting
+    $stdout.stubs(:tty?).returns false
+    assert_equal "", Tty.to_s
+    assert_equal "", Tty.red.to_s
+    assert_equal "", Tty.green.to_s
+    assert_equal "", Tty.yellow.to_s
+    assert_equal "", Tty.blue.to_s
+    assert_equal "", Tty.magenta.to_s
+    assert_equal "", Tty.cyan.to_s
+    assert_equal "", Tty.default.to_s
+  end
+
+  def test_formatting
+    $stdout.stubs(:tty?).returns(true)
+    assert_equal "",         Tty.to_s
+    assert_equal "\033[31m", Tty.red.to_s
+    assert_equal "\033[32m", Tty.green.to_s
+    assert_equal "\033[33m", Tty.yellow.to_s
+    assert_equal "\033[34m", Tty.blue.to_s
+    assert_equal "\033[35m", Tty.magenta.to_s
+    assert_equal "\033[36m", Tty.cyan.to_s
+    assert_equal "\033[39m", Tty.default.to_s
+  end
+end
diff --git a/Library/Homebrew/test/test_utils.rb b/Library/Homebrew/test/test/utils_test.rb
index 7c0b6f78a..146f57b49 100644
--- a/Library/Homebrew/test/test_utils.rb
+++ b/Library/Homebrew/test/test/utils_test.rb
@@ -3,50 +3,6 @@ require "utils"
 require "tempfile"
 require "utils/shell"
 
-class TtyTests < Homebrew::TestCase
-  def test_strip_ansi
-    assert_equal "hello", Tty.strip_ansi("\033\[36;7mhello\033\[0m")
-  end
-
-  def test_width
-    assert_kind_of Integer, Tty.width
-  end
-
-  def test_truncate
-    Tty.stubs(:width).returns 15
-    assert_equal "foobar some", Tty.truncate("foobar something very long")
-    assert_equal "truncate", Tty.truncate("truncate")
-
-    # When the terminal is unsupported, we report 0 width
-    Tty.stubs(:width).returns 0
-    assert_equal "foobar something very long", Tty.truncate("foobar something very long")
-  end
-
-  def test_no_tty_formatting
-    $stdout.stubs(:tty?).returns false
-    assert_equal "", Tty.to_s
-    assert_equal "", Tty.red.to_s
-    assert_equal "", Tty.green.to_s
-    assert_equal "", Tty.yellow.to_s
-    assert_equal "", Tty.blue.to_s
-    assert_equal "", Tty.magenta.to_s
-    assert_equal "", Tty.cyan.to_s
-    assert_equal "", Tty.default.to_s
-  end
-
-  def test_formatting
-    $stdout.stubs(:tty?).returns(true)
-    assert_equal "",         Tty.to_s
-    assert_equal "\033[31m", Tty.red.to_s
-    assert_equal "\033[32m", Tty.green.to_s
-    assert_equal "\033[33m", Tty.yellow.to_s
-    assert_equal "\033[34m", Tty.blue.to_s
-    assert_equal "\033[35m", Tty.magenta.to_s
-    assert_equal "\033[36m", Tty.cyan.to_s
-    assert_equal "\033[39m", Tty.default.to_s
-  end
-end
-
 class UtilTests < Homebrew::TestCase
   def setup
     @dir = Pathname.new(mktmpdir)
diff --git a/Library/Homebrew/test/test_version.rb b/Library/Homebrew/test/test/version_test.rb
index ca37e3567..ca37e3567 100644
--- a/Library/Homebrew/test/test_version.rb
+++ b/Library/Homebrew/test/test/version_test.rb
diff --git a/Library/Homebrew/test/test_versions.rb b/Library/Homebrew/test/test/versions_test.rb
index a6e922178..a6e922178 100644
--- a/Library/Homebrew/test/test_versions.rb
+++ b/Library/Homebrew/test/test/versions_test.rb
diff --git a/Library/Homebrew/test/test_x11_requirement.rb b/Library/Homebrew/test/test/x11_requirement_test.rb
index b82a59e53..b82a59e53 100644
--- a/Library/Homebrew/test/test_x11_requirement.rb
+++ b/Library/Homebrew/test/test/x11_requirement_test.rb