diff --git a/Library/Homebrew/dev-cmd/livecheck.rb b/Library/Homebrew/dev-cmd/livecheck.rb
index 39c59fb77f..c1d2cfc206 100644
--- a/Library/Homebrew/dev-cmd/livecheck.rb
+++ b/Library/Homebrew/dev-cmd/livecheck.rb
@@ -74,6 +74,8 @@ module Homebrew
       rescue Errno::ENOENT => e
         onoe e
       end
+    end.sort_by do |formula_or_cask|
+      formula_or_cask.respond_to?("token") ? formula_or_cask.token : formula_or_cask.name
     end
 
     raise UsageError, "No formulae or casks to check." if formulae_and_casks_to_check.blank?
diff --git a/Library/Homebrew/livecheck/livecheck.rb b/Library/Homebrew/livecheck/livecheck.rb
index ae8441eb5a..bd7c88e50e 100644
--- a/Library/Homebrew/livecheck/livecheck.rb
+++ b/Library/Homebrew/livecheck/livecheck.rb
@@ -92,7 +92,7 @@ module Homebrew
         )
       end
 
-      formulae_checked = formulae_and_casks_to_check.sort_by(&:name).map.with_index do |formula_or_cask, i|
+      formulae_checked = formulae_and_casks_to_check.map.with_index do |formula_or_cask, i|
         formula = formula_or_cask if formula_or_cask.is_a?(Formula)
         cask = formula_or_cask if formula_or_cask.is_a?(Cask::Cask)