3 files changed, 9 insertions, 31 deletions
diff --git a/Library/Homebrew/test/test_ENV.rb b/Library/Homebrew/test/test_ENV.rb
index a5ee46e88..94a182ac2 100644
--- a/Library/Homebrew/test/test_ENV.rb
+++ b/Library/Homebrew/test/test_ENV.rb
@@ -127,24 +127,12 @@ end
 class SuperenvTests < Homebrew::TestCase
   include SharedEnvTests
 
-  attr_reader :env, :bin
-
   def setup
     @env = {}.extend(Superenv)
-    @bin = HOMEBREW_REPOSITORY/"Library/ENV/#{MacOS::Xcode.version}"
-    bin.mkpath
-  end
-
-  def test_bin
-    assert_equal bin, Superenv.bin
   end
 
   def test_initializes_deps
-    assert_equal [], env.deps
-    assert_equal [], env.keg_only_deps
-  end
-
-  def teardown
-    bin.rmtree
+    assert_equal [], @env.deps
+    assert_equal [], @env.keg_only_deps
   end
 end
diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index fbac07109..d17ab272e 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -178,19 +178,7 @@ class FormulaTests < Homebrew::TestCase
   end
 
   def test_factory
-    name = 'foo-bar'
-    path = HOMEBREW_PREFIX+"Library/Formula/#{name}.rb"
-    path.dirname.mkpath
-    File.open(path, 'w') do |f|
-      f << %{
-        class #{Formulary.class_s(name)} < Formula
-          url 'foo-1.0'
-        end
-      }
-    end
-    assert_kind_of Formula, Formulary.factory(name)
-  ensure
-    path.unlink
+    assert_kind_of Formula, Formulary.factory("tree")
   end
 
   def test_class_specs_are_always_initialized
diff --git a/Library/Homebrew/test/testing_env.rb b/Library/Homebrew/test/testing_env.rb
index fc5d80441..1e3f917b0 100644
--- a/Library/Homebrew/test/testing_env.rb
+++ b/Library/Homebrew/test/testing_env.rb
@@ -1,6 +1,7 @@
 # Require this file to build a testing environment.
 
-$:.push(File.expand_path(__FILE__+'/../..'))
+repo_root = Pathname.new File.expand_path("../../../..", __FILE__)
+$: << repo_root.join("Library", "Homebrew").to_s
 
 require 'extend/module'
 require 'extend/fileutils'
@@ -19,8 +20,10 @@ at_exit { FileUtils.remove_entry(TEST_TMPDIR) }
 
 # Constants normally defined in global.rb
 HOMEBREW_PREFIX        = Pathname.new(TEST_TMPDIR).join("prefix")
-HOMEBREW_REPOSITORY    = HOMEBREW_PREFIX
+HOMEBREW_REPOSITORY    = repo_root
+HOMEBREW_BREW_FILE     = HOMEBREW_REPOSITORY+"bin"+"brew"
 HOMEBREW_LIBRARY       = HOMEBREW_REPOSITORY+'Library'
+HOMEBREW_LIBRARY_PATH  = HOMEBREW_LIBRARY+"Homebrew"
 HOMEBREW_CACHE         = HOMEBREW_PREFIX.parent+'cache'
 HOMEBREW_CACHE_FORMULA = HOMEBREW_PREFIX.parent+'formula_cache'
 HOMEBREW_CELLAR        = HOMEBREW_PREFIX.parent+'cellar'
@@ -48,8 +51,7 @@ MACOS_VERSION = ENV.fetch('MACOS_VERSION') { MACOS_FULL_VERSION[/10\.\d+/] }
 ORIGINAL_PATHS = ENV['PATH'].split(File::PATH_SEPARATOR).map{ |p| Pathname.new(p).expand_path rescue nil }.compact.freeze
 
 # Test environment setup
-%w{ENV Formula}.each { |d| HOMEBREW_LIBRARY.join(d).mkpath }
-%w{cache formula_cache cellar logs}.each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath }
+%w{prefix cache formula_cache cellar logs}.each { |d| HOMEBREW_PREFIX.parent.join(d).mkpath }
 
 # Test fixtures and files can be found relative to this path
 TEST_DIRECTORY = File.dirname(File.expand_path(__FILE__))