diff --git a/Library/Homebrew/cmd/test-bot.rb b/Library/Homebrew/cmd/test-bot.rb
index 59593327dd..1d7458a6d4 100644
--- a/Library/Homebrew/cmd/test-bot.rb
+++ b/Library/Homebrew/cmd/test-bot.rb
@@ -365,7 +365,7 @@ module Homebrew
       dependents -= @formulae
       dependents = dependents.map {|d| Formulary.factory(d)}
 
-      testable_dependents = dependents.select {|d| d.test_defined? && d.stable.bottled? }
+      testable_dependents = dependents.select { |d| d.test_defined? && d.bottled? }
 
       formula = Formulary.factory(formula_name)
       installed_gcc = false
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index 4ecb348e61..f953c087db 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -147,10 +147,20 @@ class Formula
     active_spec == head
   end
 
+  # @private
+  def bottled?
+    active_spec.bottled?
+  end
+
+  # @private
+  def bottle_specification
+    active_spec.bottle_specification
+  end
+
   # The Bottle object for the currently active {SoftwareSpec}.
   # @private
   def bottle
-    Bottle.new(self, active_spec.bottle_specification) if active_spec.bottled?
+    Bottle.new(self, bottle_specification) if bottled?
   end
 
   # The homepage for the software.
diff --git a/Library/Homebrew/formula_versions.rb b/Library/Homebrew/formula_versions.rb
index fc3c1cbaa8..61192dd657 100644
--- a/Library/Homebrew/formula_versions.rb
+++ b/Library/Homebrew/formula_versions.rb
@@ -78,7 +78,7 @@ class FormulaVersions
     map = Hash.new { |h, k| h[k] = [] }
     rev_list(branch) do |rev|
       formula_at_revision(rev) do |f|
-        bottle = f.stable.bottle_specification
+        bottle = f.bottle_specification
         unless bottle.checksums.empty?
           map[f.pkg_version] << bottle.revision
         end