diff --git a/Formula/bittwist.rb b/Formula/bittwist.rb
index c9f3261815..3982b48b82 100644
--- a/Formula/bittwist.rb
+++ b/Formula/bittwist.rb
@@ -10,7 +10,7 @@ class Bittwist < Formula
   end
 
   test do
-    system "#{bin}/bittwist -help"
-    system "#{bin}/bittwiste -help"
+    system "#{bin}/bittwist", "-help"
+    system "#{bin}/bittwiste", "-help"
   end
 end
diff --git a/Formula/blahtexml.rb b/Formula/blahtexml.rb
index 5b33411ccc..79c4c852f7 100644
--- a/Formula/blahtexml.rb
+++ b/Formula/blahtexml.rb
@@ -4,9 +4,10 @@ class Blahtexml < Formula
   url "http://gva.noekeon.org/blahtexml/blahtexml-0.9-src.tar.gz"
   sha256 "c5145b02bdf03cd95b7b136de63286819e696639824961d7408bec4591bc3737"
 
-  option "blahtex-only", "Build only blahtex, not blahtexml"
+  deprecated_option "blahtex-only" => "without-blahtexml"
+  option "without-blahtexml", "Build only blahtex, not blahtexml"
 
-  depends_on "xerces-c" unless build.include? "blahtex-only"
+  depends_on "xerces-c" if build.with? "blahtexml"
 
   # Add missing unistd.h includes, taken from MacPorts
   patch :p0 do
@@ -20,10 +21,10 @@ class Blahtexml < Formula
   end
 
   def install
-    system "make blahtex-mac"
+    system "make", "blahtex-mac"
     bin.install "blahtex"
-    unless build.include? "blahtex-only"
-      system "make blahtexml-mac"
+    if build.with? "blahtexml"
+      system "make", "blahtexml-mac"
       bin.install "blahtexml"
     end
   end
diff --git a/Formula/blazeblogger.rb b/Formula/blazeblogger.rb
index 43c7fd340e..e3712dea71 100644
--- a/Formula/blazeblogger.rb
+++ b/Formula/blazeblogger.rb
@@ -22,6 +22,6 @@ class Blazeblogger < Formula
     system bin/"blaze", "config", "blog.title", "Homebrew!"
     system bin/"blaze", "make"
     assert File.exist? "default.css"
-    assert File.read(".blaze/config").include?("Homebrew!")
+    assert_match "Homebrew!", File.read(".blaze/config")
   end
 end
diff --git a/Formula/blockhash.rb b/Formula/blockhash.rb
index ab5d780162..57386e9cc5 100644
--- a/Formula/blockhash.rb
+++ b/Formula/blockhash.rb
@@ -1,9 +1,9 @@
 class Blockhash < Formula
   desc "Perceptual image hash calculation tool"
   homepage "http://blockhash.io/"
-  head "https://github.com/commonsmachinery/blockhash.git"
   url "https://github.com/commonsmachinery/blockhash/archive/0.1.tar.gz"
   sha256 "aef300f39be2cbc1b508af15d7ddb5b851b671b27680d8b7ab1d043cc0369893"
+  head "https://github.com/commonsmachinery/blockhash.git"
 
   bottle do
     cellar :any
@@ -33,6 +33,6 @@ class Blockhash < Formula
     # for now
     # https://github.com/commonsmachinery/blockhash/pull/9
     result = pipe_output("#{bin}/blockhash #{testpath}/clipper_ship.jpg", nil, nil)
-    assert result.include? hash
+    assert_match hash, result
   end
 end