diff --git a/Library/Homebrew/extend/ENV.rb b/Library/Homebrew/extend/ENV.rb
index aff48a686f..0eaa942552 100644
--- a/Library/Homebrew/extend/ENV.rb
+++ b/Library/Homebrew/extend/ENV.rb
@@ -1,3 +1,5 @@
+require 'hardware'
+
 module HomebrewEnvExtension
   # -w: keep signal to noise high
   SAFE_CFLAGS_FLAGS = "-w -pipe"
diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb
index efce93aaf9..e2f55d8a97 100644
--- a/Library/Homebrew/macos.rb
+++ b/Library/Homebrew/macos.rb
@@ -1,4 +1,5 @@
 require 'os/mac/version'
+require 'hardware'
 
 module MacOS extend self
 
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index 123918b46f..045909c332 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -1,5 +1,4 @@
 require 'testing_env'
-require 'hardware'
 
 class EnvironmentTests < Test::Unit::TestCase
   def test_ENV_options
diff --git a/Library/Homebrew/test/test_download_strategies.rb b/Library/Homebrew/test/test_download_strategies.rb
index fcef2a2821..ef330de42c 100644
--- a/Library/Homebrew/test/test_download_strategies.rb
+++ b/Library/Homebrew/test/test_download_strategies.rb
@@ -1,7 +1,6 @@
 require 'testing_env'
 require 'download_strategy'
 require 'bottles' # XXX: hoist these regexps into constants in Pathname?
-require 'hardware' # XXX: wat. fix this require mess!
 
 class SoftwareSpecDouble
   attr_reader :url, :specs
diff --git a/Library/Homebrew/test/test_language_module_dependency.rb b/Library/Homebrew/test/test_language_module_dependency.rb
index 9776d1263e..d0b87b4ad0 100644
--- a/Library/Homebrew/test/test_language_module_dependency.rb
+++ b/Library/Homebrew/test/test_language_module_dependency.rb
@@ -1,9 +1,6 @@
 require 'testing_env'
 require 'requirements/language_module_dependency'
 
-# XXX: Figure out what env file needs to require hardware
-require 'hardware'
-
 class LanguageModuleDependencyTests < Test::Unit::TestCase
   def assert_deps_fail(spec)
     l = LanguageModuleDependency.new(*spec.shift.reverse)
diff --git a/Library/Homebrew/test/test_software_spec.rb b/Library/Homebrew/test/test_software_spec.rb
index 52070bf021..0090ec099e 100644
--- a/Library/Homebrew/test/test_software_spec.rb
+++ b/Library/Homebrew/test/test_software_spec.rb
@@ -1,8 +1,5 @@
 require 'testing_env'
 require 'formula_support'
-
-# XXX: grrrrr
-require 'hardware'
 require 'bottles'
 
 class SoftwareSpecTests < Test::Unit::TestCase
diff --git a/Library/Homebrew/test/test_version_subclasses.rb b/Library/Homebrew/test/test_version_subclasses.rb
index 07af63a6f6..a855f9df5e 100644
--- a/Library/Homebrew/test/test_version_subclasses.rb
+++ b/Library/Homebrew/test/test_version_subclasses.rb
@@ -1,7 +1,6 @@
 require 'testing_env'
 require 'version'
 require 'os/mac/version'
-require 'hardware'
 
 class MacOSVersionTests < Test::Unit::TestCase
   def setup