diff --git a/Library/Homebrew/test/test_bottle_tag.rb b/Library/Homebrew/test/test_bottle_tag.rb
index d6d20929e2..d091f97634 100644
--- a/Library/Homebrew/test/test_bottle_tag.rb
+++ b/Library/Homebrew/test/test_bottle_tag.rb
@@ -6,20 +6,61 @@ class BottleTagTests < Test::Unit::TestCase
     MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
     Hardware::CPU.stubs(:type).returns(:ppc)
     Hardware::CPU.stubs(:family).returns(:foo)
-    assert_equal :foo, bottle_tag
+    MacOS.stubs(:prefer_64_bit?).returns(false)
+    assert_equal :tiger_foo, bottle_tag
   end
 
   def test_tag_tiger_intel
     MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
     Hardware::CPU.stubs(:type).returns(:intel)
+    MacOS.stubs(:prefer_64_bit?).returns(false)
     assert_equal :tiger, bottle_tag
   end
 
-  def test_tag_leopard
+  def test_tag_tiger_ppc_64
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
+    Hardware::CPU.stubs(:type).returns(:ppc)
+    Hardware::CPU.stubs(:family).returns(:g5)
+    MacOS.stubs(:prefer_64_bit?).returns(true)
+    assert_equal :tiger_g5_64, bottle_tag
+  end
+
+  # Note that this will probably never be used
+  def test_tag_tiger_intel_64
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
+    Hardware::CPU.stubs(:type).returns(:intel)
+    assert_equal :tiger_64, bottle_tag
+  end
+
+  def test_tag_leopard_intel
     MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
+    Hardware::CPU.stubs(:type).returns(:intel)
+    MacOS.stubs(:prefer_64_bit?).returns(false)
     assert_equal :leopard, bottle_tag
   end
 
+  def test_tag_leopard_ppc_64
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
+    Hardware::CPU.stubs(:type).returns(:ppc)
+    Hardware::CPU.stubs(:family).returns(:g5)
+    MacOS.stubs(:prefer_64_bit?).returns(true)
+    assert_equal :leopard_g5_64, bottle_tag
+  end
+
+  def test_tag_leopard_intel
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
+    Hardware::CPU.stubs(:type).returns(:intel)
+    MacOS.stubs(:prefer_64_bit?).returns(false)
+    assert_equal :leopard, bottle_tag
+  end
+
+  def test_tag_leopard_intel_64
+    MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
+    Hardware::CPU.stubs(:type).returns(:intel)
+    MacOS.stubs(:prefer_64_bit?).returns(true)
+    assert_equal :leopard_64, bottle_tag
+  end
+
   def test_tag_snow_leopard_32
     MacOS.stubs(:version).returns(MacOS::Version.new("10.6"))
     Hardware::CPU.stubs(:is_64_bit?).returns(false)