diff --git a/Library/Homebrew/test/test_formula.rb b/Library/Homebrew/test/test_formula.rb
index 36a243db2a..554a189fb0 100644
--- a/Library/Homebrew/test/test_formula.rb
+++ b/Library/Homebrew/test/test_formula.rb
@@ -103,9 +103,10 @@ class FormulaTests < Test::Unit::TestCase
     assert_equal :sha1, f.bottle.checksum.hash_type
     assert_equal :sha256, f.devel.checksum.hash_type
     assert_equal case MacOS.cat
-      when :snow_leopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
-      when :lion then 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d'
-      when :mountain_lion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
+      when :snow_leopard_32 then 'deadbeef'*5
+      when :snow_leopard    then 'faceb00c'*5
+      when :lion            then 'baadf00d'*5
+      when :mountain_lion   then '8badf00d'*5
       end, f.bottle.checksum.hexdigest
     assert_match /[0-9a-fA-F]{40}/, f.stable.checksum.hexdigest
     assert_match /[0-9a-fA-F]{64}/, f.devel.checksum.hexdigest
@@ -238,9 +239,10 @@ class FormulaTests < Test::Unit::TestCase
 
     assert_equal 1, f.bottle.revision
     assert_equal case MacOS.cat
-      when :snow_leopard then 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef'
-      when :lion then 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d'
-      when :mountain_lion then '8badf00d8badf00d8badf00d8badf00d8badf00d'
+      when :snow_leopard_32 then 'deadbeef'*5
+      when :snow_leopard    then 'faceb00k'*5
+      when :lion            then 'baadf00d'*5
+      when :mountain_lion   then '8badf00d'*5
       end, f.bottle.checksum.hexdigest
   end
 
diff --git a/Library/Homebrew/test/testball.rb b/Library/Homebrew/test/testball.rb
index 2afedaacbe..d3054810ae 100644
--- a/Library/Homebrew/test/testball.rb
+++ b/Library/Homebrew/test/testball.rb
@@ -107,6 +107,7 @@ class SpecTestBall < Formula
   end
 
   bottle do
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard_32
     sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
     sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
@@ -221,7 +222,8 @@ class AllCatsBottleSpecTestBall < Formula
 
   bottle do
     cellar '/private/tmp/testbrew/cellar'
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard_32
+    sha1 'faceb00cfaceb00cfaceb00cfaceb00cfaceb00c' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
     sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
   end
@@ -238,7 +240,8 @@ class RevisedBottleSpecTestBall < Formula
 
   bottle do
     revision 1
-    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard
+    sha1 'deadbeefdeadbeefdeadbeefdeadbeefdeadbeef' => :snow_leopard_32
+    sha1 'faceb00cfaceb00cfaceb00cfaceb00cfaceb00c' => :snow_leopard
     sha1 'baadf00dbaadf00dbaadf00dbaadf00dbaadf00d' => :lion
     sha1 '8badf00d8badf00d8badf00d8badf00d8badf00d' => :mountain_lion
   end