Convert all 'def test' formulae to 'test do'

Closes #26942.
Closes #26946.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>

198 files changed, 198 insertions, 198 deletions

diff --git a/Library/Formula/abcmidi.rb b/Library/Formula/abcmidi.rb
index 859e63210..6ca299dac 100644
--- a/Library/Formula/abcmidi.rb
+++ b/Library/Formula/abcmidi.rb
@@ -20,7 +20,7 @@ class Abcmidi < Formula
     system "make", "install"
   end
 
-  def test
+  test do
     system "#{bin}/abc2midi"
   end
 end
diff --git a/Library/Formula/analog.rb b/Library/Formula/analog.rb
index a8b37fd8d..797c7ab00 100644
--- a/Library/Formula/analog.rb
+++ b/Library/Formula/analog.rb
@@ -21,7 +21,7 @@ class Analog < Formula
     man1.install "analog.man" => "analog.1"
   end
 
-  def test
+  test do
     system "\"#{bin}/analog\" > /dev/null"
   end
 end
diff --git a/Library/Formula/appledoc.rb b/Library/Formula/appledoc.rb
index 7a00281f7..d31b4ca5d 100644
--- a/Library/Formula/appledoc.rb
+++ b/Library/Formula/appledoc.rb
@@ -23,7 +23,7 @@ class Appledoc < Formula
     prefix.install "Templates/"
   end
 
-  def test
+  test do
     system "#{bin}/appledoc", "--version"
   end
 end
diff --git a/Library/Formula/apt-dater.rb b/Library/Formula/apt-dater.rb
index c4e866dd5..911762641 100644
--- a/Library/Formula/apt-dater.rb
+++ b/Library/Formula/apt-dater.rb
@@ -17,7 +17,7 @@ class AptDater < Formula
     system "make", "AM_LDFLAGS=", "install"
   end
 
-  def test
+  test do
     system "#{bin}/apt-dater", "-v"
   end
 end
diff --git a/Library/Formula/arp-scan.rb b/Library/Formula/arp-scan.rb
index 661388cfa..80a939867 100644
--- a/Library/Formula/arp-scan.rb
+++ b/Library/Formula/arp-scan.rb
@@ -11,7 +11,7 @@ class ArpScan < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/arp-scan", "-V"
   end
 end
diff --git a/Library/Formula/asciitex.rb b/Library/Formula/asciitex.rb
index 5138f5b40..1b7add5b0 100644
--- a/Library/Formula/asciitex.rb
+++ b/Library/Formula/asciitex.rb
@@ -12,7 +12,7 @@ class Asciitex < Formula
     prefix.install 'EXAMPLES'
   end
 
-  def test
+  test do
     system "#{bin}/asciiTeX", "-f", "#{prefix}/EXAMPLES"
   end
 end
diff --git a/Library/Formula/aubio.rb b/Library/Formula/aubio.rb
index 68ac642d7..7c4de201c 100644
--- a/Library/Formula/aubio.rb
+++ b/Library/Formula/aubio.rb
@@ -31,7 +31,7 @@ class Aubio < Formula
     bin.env_script_all_files(libexec+'bin', :PYTHONPATH => ENV['PYTHONPATH'])
   end
 
-  def test
+  test do
     system "#{bin}/aubiocut", "--help"
   end
 end
diff --git a/Library/Formula/automake.rb b/Library/Formula/automake.rb
index 52a89d07c..10fd6e63f 100644
--- a/Library/Formula/automake.rb
+++ b/Library/Formula/automake.rb
@@ -33,7 +33,7 @@ class Automake < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/automake", "--version"
   end
 end
diff --git a/Library/Formula/bbcp.rb b/Library/Formula/bbcp.rb
index 201b08935..bc6ef3276 100644
--- a/Library/Formula/bbcp.rb
+++ b/Library/Formula/bbcp.rb
@@ -21,7 +21,7 @@ class Bbcp < Formula
     bin.install "bin/bbcp"
   end
 
-  def test
+  test do
     system "#{bin}/bbcp", "--help"
   end
 end
diff --git a/Library/Formula/bindfs.rb b/Library/Formula/bindfs.rb
index 23f23a90c..1a1132458 100644
--- a/Library/Formula/bindfs.rb
+++ b/Library/Formula/bindfs.rb
@@ -14,7 +14,7 @@ class Bindfs < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/bindfs", "-V"
   end
 end
diff --git a/Library/Formula/bochs.rb b/Library/Formula/bochs.rb
index 44a016b33..ed72233c8 100644
--- a/Library/Formula/bochs.rb
+++ b/Library/Formula/bochs.rb
@@ -48,7 +48,7 @@ class Bochs < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/bochs"
   end
 end
diff --git a/Library/Formula/calabash.rb b/Library/Formula/calabash.rb
index 4a46db915..8a40db83c 100644
--- a/Library/Formula/calabash.rb
+++ b/Library/Formula/calabash.rb
@@ -14,7 +14,7 @@ class Calabash < Formula
     bin.write_jar_script libexec/'calabash.jar', 'calabash', '-Xmx1024m'
   end
 
-  def test
+  test do
     # This small XML pipeline (*.xpl) that comes with Calabash
     # is basically its equivalent "Hello World" program.
     system "#{bin}/calabash", "#{libexec}/xpl/pipe.xpl"
diff --git a/Library/Formula/ceylon.rb b/Library/Formula/ceylon.rb
index 8d964de0f..0bf8b7883 100644
--- a/Library/Formula/ceylon.rb
+++ b/Library/Formula/ceylon.rb
@@ -20,7 +20,7 @@ class Ceylon < Formula
     "Ceylon requires Java 7."
   end
 
-  def test
+  test do
     cd "#{libexec}/samples/helloworld" do
       system "#{bin}/ceylon", "compile", "com.acme.helloworld"
       system "#{bin}/ceylon", "doc", "--non-shared", "com.acme.helloworld"
diff --git a/Library/Formula/cfengine.rb b/Library/Formula/cfengine.rb
index df778a475..1c9c363f2 100644
--- a/Library/Formula/cfengine.rb
+++ b/Library/Formula/cfengine.rb
@@ -27,7 +27,7 @@ class Cfengine < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/cf-agent", "-V"
   end
 end
diff --git a/Library/Formula/clamz.rb b/Library/Formula/clamz.rb
index cfbb990f9..7140708f1 100644
--- a/Library/Formula/clamz.rb
+++ b/Library/Formula/clamz.rb
@@ -13,7 +13,7 @@ class Clamz < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/clamz"
   end
 end
diff --git a/Library/Formula/clay.rb b/Library/Formula/clay.rb
index eb273603d..92f233111 100644
--- a/Library/Formula/clay.rb
+++ b/Library/Formula/clay.rb
@@ -15,7 +15,7 @@ class Clay < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/clay", "-e", "println(\"Hello, Clay!\");"
   end
 end
diff --git a/Library/Formula/clisp.rb b/Library/Formula/clisp.rb
index c38e77217..a95edaf16 100644
--- a/Library/Formula/clisp.rb
+++ b/Library/Formula/clisp.rb
@@ -53,7 +53,7 @@ class Clisp < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/clisp", "--version"
   end
 end
diff --git a/Library/Formula/clozure-cl.rb b/Library/Formula/clozure-cl.rb
index ef48b9971..a97fff8cc 100644
--- a/Library/Formula/clozure-cl.rb
+++ b/Library/Formula/clozure-cl.rb
@@ -51,7 +51,7 @@ class ClozureCl < Formula
     %Q{#{ccl} -e '(progn (format t "Hello world from #{bit}-bit ClozureCL") (ccl::quit))'}
   end
 
-  def test
+  test do
     system test_ccl
     system test_ccl(64)
   end
diff --git a/Library/Formula/couchdb.rb b/Library/Formula/couchdb.rb
index 202a5d787..836efd905 100644
--- a/Library/Formula/couchdb.rb
+++ b/Library/Formula/couchdb.rb
@@ -76,7 +76,7 @@ class Couchdb < Formula
     EOS
   end
 
-  def test
+  test do
     # ensure couchdb embedded spidermonkey vm works
     system "#{bin}/couchjs", "-h"
   end
diff --git a/Library/Formula/cppcheck.rb b/Library/Formula/cppcheck.rb
index a42e68835..075e115a2 100644
--- a/Library/Formula/cppcheck.rb
+++ b/Library/Formula/cppcheck.rb
@@ -40,7 +40,7 @@ class Cppcheck < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/cppcheck", "--version"
   end
 end
diff --git a/Library/Formula/csup.rb b/Library/Formula/csup.rb
index 2cd9a0e05..f02a65ba3 100644
--- a/Library/Formula/csup.rb
+++ b/Library/Formula/csup.rb
@@ -12,7 +12,7 @@ class Csup < Formula
     man1.install "csup.1"
   end
 
-  def test
+  test do
     system "#{bin}/csup", "-v"
   end
 end
diff --git a/Library/Formula/csync.rb b/Library/Formula/csync.rb
index afc78a92c..e745e750c 100644
--- a/Library/Formula/csync.rb
+++ b/Library/Formula/csync.rb
@@ -51,7 +51,7 @@ class Csync < Formula
     end
   end
 
-  def test
+  test do
     system "csync", "-V"
   end
 end
diff --git a/Library/Formula/daemon.rb b/Library/Formula/daemon.rb
index 79ecee400..274877b43 100644
--- a/Library/Formula/daemon.rb
+++ b/Library/Formula/daemon.rb
@@ -11,7 +11,7 @@ class Daemon < Formula
     system "make", "PREFIX=#{prefix}", "install"
   end
 
-  def test
+  test do
     system "#{bin}/daemon", "--version"
   end
 end
diff --git a/Library/Formula/dash.rb b/Library/Formula/dash.rb
index 2045be8a2..8811021ae 100644
--- a/Library/Formula/dash.rb
+++ b/Library/Formula/dash.rb
@@ -23,7 +23,7 @@ class Dash < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/dash", "-c", "echo Hello!"
   end
 end
diff --git a/Library/Formula/di.rb b/Library/Formula/di.rb
index 6d31ba6d0..923cbab40 100644
--- a/Library/Formula/di.rb
+++ b/Library/Formula/di.rb
@@ -10,7 +10,7 @@ class Di < Formula
     system "make", "install", "prefix=#{prefix}", "DI_MANDIR=#{man1}"
   end
 
-  def test
+  test do
     system "#{bin}/di"
   end
 end
diff --git a/Library/Formula/diffuse.rb b/Library/Formula/diffuse.rb
index 0ae1d474b..26ff745f9 100644
--- a/Library/Formula/diffuse.rb
+++ b/Library/Formula/diffuse.rb
@@ -14,7 +14,7 @@ class Diffuse < Formula
                      "--prefix=#{prefix}"
   end
 
-  def test
+  test do
     system "#{bin}/diffuse", "--help"
   end
 end
diff --git a/Library/Formula/distcc.rb b/Library/Formula/distcc.rb
index be889fe10..6922b9c2b 100644
--- a/Library/Formula/distcc.rb
+++ b/Library/Formula/distcc.rb
@@ -58,7 +58,7 @@ class Distcc < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/distcc", "--version"
   end
 end
diff --git a/Library/Formula/djvu2pdf.rb b/Library/Formula/djvu2pdf.rb
index a0150815e..77b88c3d6 100644
--- a/Library/Formula/djvu2pdf.rb
+++ b/Library/Formula/djvu2pdf.rb
@@ -13,7 +13,7 @@ class Djvu2pdf < Formula
     man1.install 'djvu2pdf.1.gz'
   end
 
-  def test
+  test do
     system "#{bin}/djvu2pdf", "-h"
   end
 end
diff --git a/Library/Formula/dmd.rb b/Library/Formula/dmd.rb
index 2697ec33c..4e809510e 100644
--- a/Library/Formula/dmd.rb
+++ b/Library/Formula/dmd.rb
@@ -58,7 +58,7 @@ class Dmd < Formula
     end
   end
 
-  def test
+  test do
     system "dmd", "#{prefix}/samples/hello.d"
     system "./hello"
   end
diff --git a/Library/Formula/dmenu.rb b/Library/Formula/dmenu.rb
index 588c1fe78..92fb56436 100644
--- a/Library/Formula/dmenu.rb
+++ b/Library/Formula/dmenu.rb
@@ -12,7 +12,7 @@ class Dmenu < Formula
     system "make", "PREFIX=#{prefix}", "install"
   end
 
-  def test
+  test do
     system "#{bin}/dmenu", "-v"
   end
 end
diff --git a/Library/Formula/duti.rb b/Library/Formula/duti.rb
index 885bf380d..2b53ae2db 100644
--- a/Library/Formula/duti.rb
+++ b/Library/Formula/duti.rb
@@ -14,7 +14,7 @@ class Duti < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/duti", "-x", "txt"
   end
 end
diff --git a/Library/Formula/dwatch.rb b/Library/Formula/dwatch.rb
index c3937c920..d13dbc779 100644
--- a/Library/Formula/dwatch.rb
+++ b/Library/Formula/dwatch.rb
@@ -19,7 +19,7 @@ class Dwatch < Formula
     etc.install "dwatch.conf"
   end
 
-  def test
+  test do
     # '-h' is not actually an option, but it exits 0
     system "#{bin}/dwatch", "-h"
   end
diff --git a/Library/Formula/dylibbundler.rb b/Library/Formula/dylibbundler.rb
index 1c05ed2d2..f7b7ceac1 100644
--- a/Library/Formula/dylibbundler.rb
+++ b/Library/Formula/dylibbundler.rb
@@ -10,7 +10,7 @@ class Dylibbundler < Formula
     bin.install "dylibbundler"
   end
 
-  def test
+  test do
     system "#{bin}/dylibbundler", "-h"
   end
 
diff --git a/Library/Formula/epic5.rb b/Library/Formula/epic5.rb
index d885b0708..f9b999871 100644
--- a/Library/Formula/epic5.rb
+++ b/Library/Formula/epic5.rb
@@ -13,7 +13,7 @@ class Epic5 < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/epic5", "-v"
   end
 end
diff --git a/Library/Formula/eprover.rb b/Library/Formula/eprover.rb
index e4a5b3d40..662afcbfe 100644
--- a/Library/Formula/eprover.rb
+++ b/Library/Formula/eprover.rb
@@ -11,7 +11,7 @@ class Eprover < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/eproof"
   end
 end
diff --git a/Library/Formula/erlang.rb b/Library/Formula/erlang.rb
index 3b757df21..b59c278e4 100644
--- a/Library/Formula/erlang.rb
+++ b/Library/Formula/erlang.rb
@@ -98,7 +98,7 @@ class Erlang < Formula
     EOS
   end
 
-  def test
+  test do
     `#{bin}/erl -noshell -eval 'crypto:start().' -s init stop`
 
     # This test takes some time to run, but per bug #120 should finish in
diff --git a/Library/Formula/exiftool.rb b/Library/Formula/exiftool.rb
index 7191cad00..fc9d50ba9 100644
--- a/Library/Formula/exiftool.rb
+++ b/Library/Formula/exiftool.rb
@@ -24,7 +24,7 @@ $dirname_unlinked_exiftool/../libexec/exiftool "$@"
 EOBIN
   end
 
-  def test
+  test do
     system "#{libexec}/exiftool"
   end
 end
diff --git a/Library/Formula/fastbit.rb b/Library/Formula/fastbit.rb
index 49be69555..c56fb1634 100644
--- a/Library/Formula/fastbit.rb
+++ b/Library/Formula/fastbit.rb
@@ -14,7 +14,7 @@ class Fastbit < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/fastbit-config", "--version"
   end
 end
diff --git a/Library/Formula/fastjar.rb b/Library/Formula/fastjar.rb
index 8fe0a2c40..499a5191e 100644
--- a/Library/Formula/fastjar.rb
+++ b/Library/Formula/fastjar.rb
@@ -11,7 +11,7 @@ class Fastjar < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/fastjar", "-V"
     system "#{bin}/grepjar", "-V"
   end
diff --git a/Library/Formula/ffmbc.rb b/Library/Formula/ffmbc.rb
index 3d006b181..2a979a28b 100644
--- a/Library/Formula/ffmbc.rb
+++ b/Library/Formula/ffmbc.rb
@@ -66,7 +66,7 @@ class Ffmbc < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/ffmbc", "-h"
   end
 end
diff --git a/Library/Formula/figlet.rb b/Library/Formula/figlet.rb
index 904831e36..9af5aa186 100644
--- a/Library/Formula/figlet.rb
+++ b/Library/Formula/figlet.rb
@@ -29,7 +29,7 @@ class Figlet < Formula
                    "install"
   end
 
-  def test
+  test do
     system "#{bin}/figlet", "-f", "larry3d", "hello, figlet"
   end
 end
diff --git a/Library/Formula/findbugs.rb b/Library/Formula/findbugs.rb
index 620495482..d4db03d1f 100644
--- a/Library/Formula/findbugs.rb
+++ b/Library/Formula/findbugs.rb
@@ -25,7 +25,7 @@ class Findbugs < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/fb"
   end
 end
diff --git a/Library/Formula/fon-flash-cli.rb b/Library/Formula/fon-flash-cli.rb
index ddfb9418d..087ea9519 100644
--- a/Library/Formula/fon-flash-cli.rb
+++ b/Library/Formula/fon-flash-cli.rb
@@ -14,7 +14,7 @@ class FonFlashCli < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/fon-flash"
   end
 end
diff --git a/Library/Formula/freeling.rb b/Library/Formula/freeling.rb
index 835d3a4a6..b618f9d23 100644
--- a/Library/Formula/freeling.rb
+++ b/Library/Formula/freeling.rb
@@ -23,7 +23,7 @@ class Freeling < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "echo 'Hello world' | #{bin}/analyze -f #{share}/freeling/config/en.cfg | grep -c 'world world NN 1'"
   end
 end
diff --git a/Library/Formula/freetds.rb b/Library/Formula/freetds.rb
index f90a4d0b0..b8e6af85c 100644
--- a/Library/Formula/freetds.rb
+++ b/Library/Formula/freetds.rb
@@ -48,7 +48,7 @@ class Freetds < Formula
     system 'make install'
   end
 
-  def test
+  test do
     system "#{bin}/tsql", "-C"
   end
 end
diff --git a/Library/Formula/fwknop.rb b/Library/Formula/fwknop.rb
index 31536d55a..f2059a800 100644
--- a/Library/Formula/fwknop.rb
+++ b/Library/Formula/fwknop.rb
@@ -20,7 +20,7 @@ class Fwknop < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/fwknop", "--version"
   end
 end
diff --git a/Library/Formula/gcutil.rb b/Library/Formula/gcutil.rb
index d7b36b8b3..0a03e82d1 100644
--- a/Library/Formula/gcutil.rb
+++ b/Library/Formula/gcutil.rb
@@ -10,7 +10,7 @@ class Gcutil < Formula
     bin.install_symlink libexec/"gcutil"
   end
 
-  def test
+  test do
     system "#{bin}/gcutil", "version"
   end
 end
diff --git a/Library/Formula/gdmap.rb b/Library/Formula/gdmap.rb
index f202861ab..bb01becbd 100644
--- a/Library/Formula/gdmap.rb
+++ b/Library/Formula/gdmap.rb
@@ -27,7 +27,7 @@ class Gdmap < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/gdmap"
   end
 end
diff --git a/Library/Formula/genstats.rb b/Library/Formula/genstats.rb
index 5b86480d8..df64ec3f3 100644
--- a/Library/Formula/genstats.rb
+++ b/Library/Formula/genstats.rb
@@ -20,7 +20,7 @@ class Genstats < Formula
     man.install('genstats.1')
   end
 
-  def test
+  test do
     system "genstats -h | grep folkert@vanheusden.com"
   end
 end
diff --git a/Library/Formula/giblib.rb b/Library/Formula/giblib.rb
index cb6340f8e..ed7f3f3dc 100644
--- a/Library/Formula/giblib.rb
+++ b/Library/Formula/giblib.rb
@@ -13,7 +13,7 @@ class Giblib < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/giblib-config", "--version"
   end
 end
diff --git a/Library/Formula/git-crypt.rb b/Library/Formula/git-crypt.rb
index 6adf183d9..e674c2c82 100644
--- a/Library/Formula/git-crypt.rb
+++ b/Library/Formula/git-crypt.rb
@@ -10,7 +10,7 @@ class GitCrypt < Formula
     bin.install "git-crypt"
   end
 
-  def test
+  test do
     system "#{bin}/git-crypt"
   end
 end
diff --git a/Library/Formula/gmail-backup.rb b/Library/Formula/gmail-backup.rb
index da350c01a..de7f6e6d6 100644
--- a/Library/Formula/gmail-backup.rb
+++ b/Library/Formula/gmail-backup.rb
@@ -14,7 +14,7 @@ class GmailBackup < Formula
     bin.env_script_all_files(libexec, :PYTHONPATH => ENV["PYTHONPATH"])
   end
 
-  def test
+  test do
     system "#{bin}/gmail-backup", "--help"
   end
 end
diff --git a/Library/Formula/gnunet.rb b/Library/Formula/gnunet.rb
index dd0ad6125..0958f22f0 100644
--- a/Library/Formula/gnunet.rb
+++ b/Library/Formula/gnunet.rb
@@ -18,7 +18,7 @@ class Gnunet < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/gnunet-search", "--version"
   end
 end
diff --git a/Library/Formula/gnuplot.rb b/Library/Formula/gnuplot.rb
index 076d19f8e..06c156a73 100644
--- a/Library/Formula/gnuplot.rb
+++ b/Library/Formula/gnuplot.rb
@@ -100,7 +100,7 @@ class Gnuplot < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/gnuplot", "--version"
   end
 
diff --git a/Library/Formula/graylog2-server.rb b/Library/Formula/graylog2-server.rb
index 8770c4050..e0833c501 100644
--- a/Library/Formula/graylog2-server.rb
+++ b/Library/Formula/graylog2-server.rb
@@ -71,7 +71,7 @@ class Graylog2Server < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/graylog2ctl"
   end
 end
diff --git a/Library/Formula/growly.rb b/Library/Formula/growly.rb
index ac9b3e36b..8cef90887 100644
--- a/Library/Formula/growly.rb
+++ b/Library/Formula/growly.rb
@@ -10,7 +10,7 @@ class Growly < Formula
     bin.install 'growly'
   end
 
-  def test
+  test do
     system "#{bin}/growly", "echo Hello, world!"
   end
 end
diff --git a/Library/Formula/gsmartcontrol.rb b/Library/Formula/gsmartcontrol.rb
index f1aefaa1e..98ef1bc16 100644
--- a/Library/Formula/gsmartcontrol.rb
+++ b/Library/Formula/gsmartcontrol.rb
@@ -25,7 +25,7 @@ class Gsmartcontrol < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/gsmartcontrol", "--version"
   end
 end
diff --git a/Library/Formula/gsoap.rb b/Library/Formula/gsoap.rb
index 147c02302..fa95d0dc7 100644
--- a/Library/Formula/gsoap.rb
+++ b/Library/Formula/gsoap.rb
@@ -11,7 +11,7 @@ class Gsoap < Formula
     system 'make install'
   end
 
-  def test
+  test do
     system "#{bin}/soapcpp2", "-v"
   end
 end
diff --git a/Library/Formula/gtk+3.rb b/Library/Formula/gtk+3.rb
index 830511bc7..6a2e446fe 100644
--- a/Library/Formula/gtk+3.rb
+++ b/Library/Formula/gtk+3.rb
@@ -32,7 +32,7 @@ class Gtkx3 < Formula
     mv bin/'gtk-update-icon-cache', bin/'gtk3-update-icon-cache'
   end
 
-  def test
+  test do
     system "#{bin}/gtk3-demo"
   end
 end
diff --git a/Library/Formula/heroku-toolbelt.rb b/Library/Formula/heroku-toolbelt.rb
index 576d473e5..3d59236da 100644
--- a/Library/Formula/heroku-toolbelt.rb
+++ b/Library/Formula/heroku-toolbelt.rb
@@ -10,7 +10,7 @@ class HerokuToolbelt < Formula
     bin.write_exec_script libexec/"bin/heroku"
   end
 
-  def test
+  test do
     system "#{bin}/heroku", "version"
   end
 
diff --git a/Library/Formula/hilite.rb b/Library/Formula/hilite.rb
index e9437a992..1aea6263e 100644
--- a/Library/Formula/hilite.rb
+++ b/Library/Formula/hilite.rb
@@ -10,7 +10,7 @@ class Hilite < Formula
     bin.install 'hilite'
   end
 
-  def test
+  test do
     system "#{bin}/hilite", "bash", "-c", "echo 'stderr in red' >&2"
   end
 end
diff --git a/Library/Formula/htpdate.rb b/Library/Formula/htpdate.rb
index 32aae5087..2d63fefa7 100644
--- a/Library/Formula/htpdate.rb
+++ b/Library/Formula/htpdate.rb
@@ -13,7 +13,7 @@ class Htpdate < Formula
                    "install"
   end
 
-  def test
+  test do
     system "#{bin}/htpdate", "-h"
   end
 end
diff --git a/Library/Formula/ideviceinstaller.rb b/Library/Formula/ideviceinstaller.rb
index 8df267fdc..16bca55a9 100644
--- a/Library/Formula/ideviceinstaller.rb
+++ b/Library/Formula/ideviceinstaller.rb
@@ -24,7 +24,7 @@ class Ideviceinstaller < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/ideviceinstaller --help |grep -q ^Usage"
   end
 end
diff --git a/Library/Formula/imageworsener.rb b/Library/Formula/imageworsener.rb
index d8f2c1f65..213a42819 100644
--- a/Library/Formula/imageworsener.rb
+++ b/Library/Formula/imageworsener.rb
@@ -12,7 +12,7 @@ class Imageworsener < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/imagew", "--version"
   end
 end
diff --git a/Library/Formula/imapfilter.rb b/Library/Formula/imapfilter.rb
index 1d46325a6..cb60c084a 100644
--- a/Library/Formula/imapfilter.rb
+++ b/Library/Formula/imapfilter.rb
@@ -30,7 +30,7 @@ class Imapfilter < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/imapfilter", "-V"
   end
 end
diff --git a/Library/Formula/inkscape.rb b/Library/Formula/inkscape.rb
index 082050b8d..f084e8005 100644
--- a/Library/Formula/inkscape.rb
+++ b/Library/Formula/inkscape.rb
@@ -34,7 +34,7 @@ class Inkscape < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/inkscape", "-V"
   end
 end
diff --git a/Library/Formula/intercal.rb b/Library/Formula/intercal.rb
index 7c32381a4..83970db1e 100644
--- a/Library/Formula/intercal.rb
+++ b/Library/Formula/intercal.rb
@@ -11,7 +11,7 @@ class Intercal < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/convickt"
     system "#{bin}/ick"
   end
diff --git a/Library/Formula/ioping.rb b/Library/Formula/ioping.rb
index d7bcfb5e8..34c839102 100644
--- a/Library/Formula/ioping.rb
+++ b/Library/Formula/ioping.rb
@@ -12,7 +12,7 @@ class Ioping < Formula
     system "make", "install", "PREFIX=#{prefix}"
   end
 
-  def test
+  test do
     system "#{bin}/ioping", "-v"
   end
 end
diff --git a/Library/Formula/ipbt.rb b/Library/Formula/ipbt.rb
index ddc1825fd..2f3a348ae 100644
--- a/Library/Formula/ipbt.rb
+++ b/Library/Formula/ipbt.rb
@@ -11,7 +11,7 @@ class Ipbt < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/ipbt"
   end
 end
diff --git a/Library/Formula/ircd-hybrid.rb b/Library/Formula/ircd-hybrid.rb
index 7faa4cb52..ed8394ed3 100644
--- a/Library/Formula/ircd-hybrid.rb
+++ b/Library/Formula/ircd-hybrid.rb
@@ -24,7 +24,7 @@ class IrcdHybrid < Formula
     etc.install "doc/reference.conf" => "ircd.conf"
   end
 
-  def test
+  test do
     system "#{sbin}/ircd", "-version"
   end
 
diff --git a/Library/Formula/irods.rb b/Library/Formula/irods.rb
index 72938d8b1..103f302d3 100644
--- a/Library/Formula/irods.rb
+++ b/Library/Formula/irods.rb
@@ -36,7 +36,7 @@ class Irods < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/ipwd"
   end
 end
diff --git a/Library/Formula/irrtoolset.rb b/Library/Formula/irrtoolset.rb
index 6b8e74cdc..5ded6cd89 100644
--- a/Library/Formula/irrtoolset.rb
+++ b/Library/Formula/irrtoolset.rb
@@ -25,7 +25,7 @@ class Irrtoolset < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/peval", "ANY"
   end
 end
diff --git a/Library/Formula/ispc.rb b/Library/Formula/ispc.rb
index 7c0287eb3..a4ff24cd2 100644
--- a/Library/Formula/ispc.rb
+++ b/Library/Formula/ispc.rb
@@ -9,7 +9,7 @@ class Ispc < Formula
     bin.install 'ispc'
   end
 
-  def test
+  test do
     system "#{bin}/ispc", "-v"
   end
 end
diff --git a/Library/Formula/jcal.rb b/Library/Formula/jcal.rb
index 6c0ea0a19..6286e1c80 100644
--- a/Library/Formula/jcal.rb
+++ b/Library/Formula/jcal.rb
@@ -18,7 +18,7 @@ class Jcal < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/jcal", "-y"
     system "#{bin}/jdate"
   end
diff --git a/Library/Formula/jigdo.rb b/Library/Formula/jigdo.rb
index 7a587def5..7a36b6352 100644
--- a/Library/Formula/jigdo.rb
+++ b/Library/Formula/jigdo.rb
@@ -23,7 +23,7 @@ class Jigdo < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/jigdo-file", "-h"
   end
 end
diff --git a/Library/Formula/jp2a.rb b/Library/Formula/jp2a.rb
index d11aa7b29..8a347bd4b 100644
--- a/Library/Formula/jp2a.rb
+++ b/Library/Formula/jp2a.rb
@@ -13,7 +13,7 @@ class Jp2a < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/jp2a", "-V"
   end
 end
diff --git a/Library/Formula/jpeginfo.rb b/Library/Formula/jpeginfo.rb
index 3dbd72096..7424a8989 100644
--- a/Library/Formula/jpeginfo.rb
+++ b/Library/Formula/jpeginfo.rb
@@ -15,7 +15,7 @@ class Jpeginfo < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/jpeginfo", "--help"
   end
 end
diff --git a/Library/Formula/jruby.rb b/Library/Formula/jruby.rb
index 95b033e35..aa46045aa 100644
--- a/Library/Formula/jruby.rb
+++ b/Library/Formula/jruby.rb
@@ -29,7 +29,7 @@ class Jruby < Formula
     bin.install_symlink Dir["#{libexec}/bin/*"]
   end
 
-  def test
+  test do
     system "#{bin}/jruby", "-e", "puts 'hello'"
   end
 end
diff --git a/Library/Formula/juju.rb b/Library/Formula/juju.rb
index add6a01fb..523214e45 100644
--- a/Library/Formula/juju.rb
+++ b/Library/Formula/juju.rb
@@ -28,7 +28,7 @@ class Juju < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/juju", "version"
   end
 end
diff --git a/Library/Formula/leptonica.rb b/Library/Formula/leptonica.rb
index 4bec1c85d..ec4149339 100644
--- a/Library/Formula/leptonica.rb
+++ b/Library/Formula/leptonica.rb
@@ -18,7 +18,7 @@ class Leptonica < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/yuvtest"
   end
 end
diff --git a/Library/Formula/libcaca.rb b/Library/Formula/libcaca.rb
index 860ab9cee..df3a70eaa 100644
--- a/Library/Formula/libcaca.rb
+++ b/Library/Formula/libcaca.rb
@@ -45,7 +45,7 @@ class Libcaca < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/img2txt", "--version"
   end
 end
diff --git a/Library/Formula/libcec.rb b/Library/Formula/libcec.rb
index fffe264cb..b87cb6b33 100644
--- a/Library/Formula/libcec.rb
+++ b/Library/Formula/libcec.rb
@@ -17,7 +17,7 @@ class Libcec < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/cec-client", "--info"
   end
 end
diff --git a/Library/Formula/libcouchbase.rb b/Library/Formula/libcouchbase.rb
index 77fe5d100..3ce7a56ce 100644
--- a/Library/Formula/libcouchbase.rb
+++ b/Library/Formula/libcouchbase.rb
@@ -33,7 +33,7 @@ class Libcouchbase < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/cbc", "version"
   end
 end
diff --git a/Library/Formula/libextractor.rb b/Library/Formula/libextractor.rb
index bb115013b..396859517 100644
--- a/Library/Formula/libextractor.rb
+++ b/Library/Formula/libextractor.rb
@@ -18,7 +18,7 @@ class Libextractor < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/extract", "-v"
   end
 end
diff --git a/Library/Formula/libidn.rb b/Library/Formula/libidn.rb
index 90066948b..8432f5b43 100644
--- a/Library/Formula/libidn.rb
+++ b/Library/Formula/libidn.rb
@@ -25,7 +25,7 @@ class Libidn < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/idn", "--version"
   end
 end
diff --git a/Library/Formula/libmikmod.rb b/Library/Formula/libmikmod.rb
index 2fcbcda6c..106137399 100644
--- a/Library/Formula/libmikmod.rb
+++ b/Library/Formula/libmikmod.rb
@@ -24,7 +24,7 @@ class Libmikmod < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/libmikmod-config", "--version"
   end
 end
diff --git a/Library/Formula/libqalculate.rb b/Library/Formula/libqalculate.rb
index f39f22d10..326002964 100644
--- a/Library/Formula/libqalculate.rb
+++ b/Library/Formula/libqalculate.rb
@@ -22,7 +22,7 @@ class Libqalculate < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/qalc", "(2+2)/4 hours to minutes"
   end
 end
diff --git a/Library/Formula/libraw.rb b/Library/Formula/libraw.rb
index c7061be33..515ccb964 100644
--- a/Library/Formula/libraw.rb
+++ b/Library/Formula/libraw.rb
@@ -37,7 +37,7 @@ class Libraw < Formula
     prefix.install 'samples'
   end
 
-  def test
+  test do
     resource('librawtestfile').stage do
       filename = 'RAW_NIKON_D1.NEF'
       system "#{bin}/raw-identify", "-u", filename
diff --git a/Library/Formula/libswiften.rb b/Library/Formula/libswiften.rb
index 65f42052a..373618f77 100644
--- a/Library/Formula/libswiften.rb
+++ b/Library/Formula/libswiften.rb
@@ -48,7 +48,7 @@ class Libswiften < Formula
     man1.install 'Swift/Packaging/Debian/debian/swiften-config.1' unless build.stable?
   end
 
-  def test
+  test do
     system "#{bin}/swiften-config"
   end
 end
diff --git a/Library/Formula/link-grammar.rb b/Library/Formula/link-grammar.rb
index 288d025e0..b33751922 100644
--- a/Library/Formula/link-grammar.rb
+++ b/Library/Formula/link-grammar.rb
@@ -13,7 +13,7 @@ class LinkGrammar < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/link-parser", "--version"
   end
 end
diff --git a/Library/Formula/llvm.rb b/Library/Formula/llvm.rb
index cb5e5f2d6..65a493563 100644
--- a/Library/Formula/llvm.rb
+++ b/Library/Formula/llvm.rb
@@ -69,7 +69,7 @@ class Llvm < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/llvm-config", "--version"
   end
 
diff --git a/Library/Formula/log4c.rb b/Library/Formula/log4c.rb
index 2f5315152..4a619f729 100644
--- a/Library/Formula/log4c.rb
+++ b/Library/Formula/log4c.rb
@@ -12,7 +12,7 @@ class Log4c < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/log4c-config", "--version"
   end
 end
diff --git a/Library/Formula/logcheck.rb b/Library/Formula/logcheck.rb
index 9e127f2dc..9fe63dabc 100644
--- a/Library/Formula/logcheck.rb
+++ b/Library/Formula/logcheck.rb
@@ -13,7 +13,7 @@ class Logcheck < Formula
                    "BINDIR=bin"
   end
 
-  def test
+  test do
     system "#{sbin}/logtail", "-f", "#{HOMEBREW_REPOSITORY}/README.md"
   end
 end
diff --git a/Library/Formula/lsyncd.rb b/Library/Formula/lsyncd.rb
index 56102fe24..bcdd9f903 100644
--- a/Library/Formula/lsyncd.rb
+++ b/Library/Formula/lsyncd.rb
@@ -60,7 +60,7 @@ class Lsyncd < Formula
 
   end
 
-  def test
+  test do
     system "lsyncd", "--version"
   end
 end
diff --git a/Library/Formula/luarocks.rb b/Library/Formula/luarocks.rb
index ff18bee80..f7e130c02 100644
--- a/Library/Formula/luarocks.rb
+++ b/Library/Formula/luarocks.rb
@@ -58,7 +58,7 @@ class Luarocks < Formula
     EOS
   end
 
-  def test
+  test do
     opoo "Luarocks test script installs 'lpeg'"
     system "#{bin}/luarocks", "install", "lpeg"
     system "lua", "-llpeg", "-e", 'print ("Hello World!")'
diff --git a/Library/Formula/mackup.rb b/Library/Formula/mackup.rb
index e17cc51f8..e0a7e9d26 100644
--- a/Library/Formula/mackup.rb
+++ b/Library/Formula/mackup.rb
@@ -13,7 +13,7 @@ class Mackup < Formula
     system 'python', 'setup.py', 'install', "--prefix=#{prefix}"
   end
 
-  def test
+  test do
     system "#{bin}/mackup", '--help'
   end
 end
diff --git a/Library/Formula/mapserver.rb b/Library/Formula/mapserver.rb
index e4681a0f7..05d36d761 100644
--- a/Library/Formula/mapserver.rb
+++ b/Library/Formula/mapserver.rb
@@ -77,7 +77,7 @@ class Mapserver < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/mapserver-config", "--version"
   end
 end
diff --git a/Library/Formula/mboxgrep.rb b/Library/Formula/mboxgrep.rb
index a6864a1b3..4be90e3e8 100644
--- a/Library/Formula/mboxgrep.rb
+++ b/Library/Formula/mboxgrep.rb
@@ -15,7 +15,7 @@ class Mboxgrep < Formula
     system "make", "install"
   end
 
-  def test
+  test do
     system "#{bin}/mboxgrep", "--version"
   end
 end
diff --git a/Library/Formula/md5deep.rb b/Library/Formula/md5deep.rb
index 17f346bd9..2683b479a 100644
--- a/Library/Formula/md5deep.rb
+++ b/Library/Formula/md5deep.rb
@@ -10,7 +10,7 @@ class Md5deep < Formula
     system "make install"
   end
 
-  def test
+  test do
     system bin/"md5deep", "-h"
     system bin/"hashdeep", "-h"
   end
diff --git a/Library/Formula/mikmod.rb b/Library/Formula/mikmod.rb
index 9ca82a864..790a7d1ff 100644
--- a/Library/Formula/mikmod.rb
+++ b/Library/Formula/mikmod.rb
@@ -14,7 +14,7 @@ class Mikmod < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/mikmod", "-V"
   end
 end
diff --git a/Library/Formula/minizinc.rb b/Library/Formula/minizinc.rb
index 2991a1212..6a7b55dff 100644
--- a/Library/Formula/minizinc.rb
+++ b/Library/Formula/minizinc.rb
@@ -21,7 +21,7 @@ class Minizinc < Formula
     (bin/'private').unlink
   end
 
-  def test
+  test do
     system "#{bin}/mzn2fzn", "--help"
   end
 end
diff --git a/Library/Formula/mmsrip.rb b/Library/Formula/mmsrip.rb
index 56fb4016b..2cd41842f 100644
--- a/Library/Formula/mmsrip.rb
+++ b/Library/Formula/mmsrip.rb
@@ -12,7 +12,7 @@ class Mmsrip < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/mmsrip", "-v"
   end
 end
diff --git a/Library/Formula/monit.rb b/Library/Formula/monit.rb
index 42c13117c..52c86f5c4 100644
--- a/Library/Formula/monit.rb
+++ b/Library/Formula/monit.rb
@@ -12,7 +12,7 @@ class Monit < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/monit", "-h"
   end
 end
diff --git a/Library/Formula/mpegdemux.rb b/Library/Formula/mpegdemux.rb
index 16cf48e82..7c6ae0537 100644
--- a/Library/Formula/mpegdemux.rb
+++ b/Library/Formula/mpegdemux.rb
@@ -11,7 +11,7 @@ class Mpegdemux < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/mpegdemux", "--help"
   end
 end
diff --git a/Library/Formula/mpich2.rb b/Library/Formula/mpich2.rb
index 8f244a9d8..ffc6790a5 100644
--- a/Library/Formula/mpich2.rb
+++ b/Library/Formula/mpich2.rb
@@ -56,7 +56,7 @@ class Mpich2 < Formula
     system "make install"
   end
 
-  def test
+  test do
     # a better test would be to build and run a small MPI program
     system "#{bin}/mpicc", "-show"
   end
diff --git a/Library/Formula/mplayer.rb b/Library/Formula/mplayer.rb
index 76cb62923..1bf60ecda 100644
--- a/Library/Formula/mplayer.rb
+++ b/Library/Formula/mplayer.rb
@@ -66,7 +66,7 @@ class Mplayer < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/mplayer", "-ao", "null", "/System/Library/Sounds/Glass.aiff"
   end
 end
diff --git a/Library/Formula/mpssh.rb b/Library/Formula/mpssh.rb
index 5ef94580c..d7fc890d6 100644
--- a/Library/Formula/mpssh.rb
+++ b/Library/Formula/mpssh.rb
@@ -11,7 +11,7 @@ class Mpssh < Formula
     man1.install "mpssh.man" => "mpssh.1"
   end
 
-  def test
+  test do
     system "#{bin}/mpssh"
   end
 end
diff --git a/Library/Formula/mspdebug.rb b/Library/Formula/mspdebug.rb
index 554803023..ffc9e6c16 100644
--- a/Library/Formula/mspdebug.rb
+++ b/Library/Formula/mspdebug.rb
@@ -18,7 +18,7 @@ class Mspdebug < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/mspdebug", "--help"
   end
 end
diff --git a/Library/Formula/mydumper.rb b/Library/Formula/mydumper.rb
index ba5011f42..8075edab3 100644
--- a/Library/Formula/mydumper.rb
+++ b/Library/Formula/mydumper.rb
@@ -16,7 +16,7 @@ class Mydumper < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/mydumper", "--version"
   end
 end
diff --git a/Library/Formula/ndiff.rb b/Library/Formula/ndiff.rb
index 70021fa3d..6f2c8188d 100644
--- a/Library/Formula/ndiff.rb
+++ b/Library/Formula/ndiff.rb
@@ -18,7 +18,7 @@ class Ndiff < Formula
     man1.install "man/man1/ndiff.1"
   end
 
-  def test
+  test do
     system "#{bin}/ndiff", "--help"
   end
 end
diff --git a/Library/Formula/ngspice.rb b/Library/Formula/ngspice.rb
index fdf5ad705..81aa4b8a2 100644
--- a/Library/Formula/ngspice.rb
+++ b/Library/Formula/ngspice.rb
@@ -23,7 +23,7 @@ class Ngspice < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/ngspice", "-v"
   end
 end
diff --git a/Library/Formula/nicovideo-dl.rb b/Library/Formula/nicovideo-dl.rb
index f68950ed1..e3a63b051 100644
--- a/Library/Formula/nicovideo-dl.rb
+++ b/Library/Formula/nicovideo-dl.rb
@@ -9,7 +9,7 @@ class NicovideoDl < Formula
     bin.install 'nicovideo-dl'
   end
 
-  def test
+  test do
     system "#{bin}/nicovideo-dl",  "-v"
   end
 end
diff --git a/Library/Formula/normalize.rb b/Library/Formula/normalize.rb
index a0e24feb4..a2e9d5c4f 100644
--- a/Library/Formula/normalize.rb
+++ b/Library/Formula/normalize.rb
@@ -24,7 +24,7 @@ class Normalize < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/normalize"
   end
 end
diff --git a/Library/Formula/open-cobol.rb b/Library/Formula/open-cobol.rb
index 2aca55489..266c58ce3 100644
--- a/Library/Formula/open-cobol.rb
+++ b/Library/Formula/open-cobol.rb
@@ -14,7 +14,7 @@ class OpenCobol < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/cobc", "--help"
   end
 end
diff --git a/Library/Formula/ori.rb b/Library/Formula/ori.rb
index 17bf5e5a8..53e02a03e 100644
--- a/Library/Formula/ori.rb
+++ b/Library/Formula/ori.rb
@@ -17,7 +17,7 @@ class Ori < Formula
     system "scons", "install", "PREFIX=#{prefix}"
   end
 
-  def test
+  test do
     system "#{bin}/ori"
   end
 end
diff --git a/Library/Formula/pango.rb b/Library/Formula/pango.rb
index 7e97eef84..2d5bd7942 100644
--- a/Library/Formula/pango.rb
+++ b/Library/Formula/pango.rb
@@ -48,7 +48,7 @@ class Pango < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/pango-querymodules", "--version"
   end
 end
diff --git a/Library/Formula/pass.rb b/Library/Formula/pass.rb
index 7d49e4729..db001e179 100644
--- a/Library/Formula/pass.rb
+++ b/Library/Formula/pass.rb
@@ -17,7 +17,7 @@ class Pass < Formula
     zsh_completion.install "contrib/pass.zsh-completion" => "_pass"
   end
 
-  def test
+  test do
     system "#{bin}/pass", "--version"
   end
 end
diff --git a/Library/Formula/pcal.rb b/Library/Formula/pcal.rb
index 1aa18fec8..8925cf30f 100644
--- a/Library/Formula/pcal.rb
+++ b/Library/Formula/pcal.rb
@@ -14,7 +14,7 @@ class Pcal < Formula
     man1.install gzip('doc/pcal.man') => 'pcal.1.gz'
   end
 
-  def test
+  test do
     system "#{bin}/pcal"
   end
 end
diff --git a/Library/Formula/pdfgrep.rb b/Library/Formula/pdfgrep.rb
index ca8ec9e7b..4c95596e3 100644
--- a/Library/Formula/pdfgrep.rb
+++ b/Library/Formula/pdfgrep.rb
@@ -15,7 +15,7 @@ class Pdfgrep < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/pdfgrep", "--version"
   end
 end
diff --git a/Library/Formula/peervpn.rb b/Library/Formula/peervpn.rb
index 2eceef443..8f5ef9be4 100644
--- a/Library/Formula/peervpn.rb
+++ b/Library/Formula/peervpn.rb
@@ -22,7 +22,7 @@ class Peervpn < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/peervpn"
   end
 end
diff --git a/Library/Formula/percona-toolkit.rb b/Library/Formula/percona-toolkit.rb
index f8e4edb99..f3bb84ba0 100644
--- a/Library/Formula/percona-toolkit.rb
+++ b/Library/Formula/percona-toolkit.rb
@@ -15,7 +15,7 @@ class PerconaToolkit < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/pt-agent"
     system "#{bin}/pt-align"
     system "#{bin}/pt-archiver"
diff --git a/Library/Formula/pipebench.rb b/Library/Formula/pipebench.rb
index 2dc8eec02..34d8af780 100644
--- a/Library/Formula/pipebench.rb
+++ b/Library/Formula/pipebench.rb
@@ -11,7 +11,7 @@ class Pipebench < Formula
     man1.install 'pipebench.1'
   end
 
-  def test
+  test do
     system "#{bin}/pipebench", "-h"
   end
 end
diff --git a/Library/Formula/pixie.rb b/Library/Formula/pixie.rb
index 3114acfd4..35eeee7d0 100644
--- a/Library/Formula/pixie.rb
+++ b/Library/Formula/pixie.rb
@@ -23,7 +23,7 @@ class Pixie < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/rndr", "-v"
   end
 end
diff --git a/Library/Formula/platypus.rb b/Library/Formula/platypus.rb
index c53c69045..c475d1dcc 100644
--- a/Library/Formula/platypus.rb
+++ b/Library/Formula/platypus.rb
@@ -31,7 +31,7 @@ class Platypus < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/platypus", "-v"
   end
 
diff --git a/Library/Formula/pngquant.rb b/Library/Formula/pngquant.rb
index cf9eb72ef..813fa3c3a 100644
--- a/Library/Formula/pngquant.rb
+++ b/Library/Formula/pngquant.rb
@@ -16,7 +16,7 @@ class Pngquant < Formula
     man1.install 'pngquant.1'
   end
 
-  def test
+  test do
     system "#{bin}/pngquant", "--help"
   end
 end
diff --git a/Library/Formula/pplatex.rb b/Library/Formula/pplatex.rb
index 9c36d9cf1..b479896ef 100644
--- a/Library/Formula/pplatex.rb
+++ b/Library/Formula/pplatex.rb
@@ -13,7 +13,7 @@ class Pplatex < Formula
     bin.install 'bin/pplatex', 'bin/ppdflatex'
   end
 
-  def test
+  test do
     system "#{bin}/pplatex", "-h"
   end
 end
diff --git a/Library/Formula/primesieve.rb b/Library/Formula/primesieve.rb
index 253250675..7e2e637dc 100644
--- a/Library/Formula/primesieve.rb
+++ b/Library/Formula/primesieve.rb
@@ -11,7 +11,7 @@ class Primesieve < Formula
     system 'make install'
   end
 
-  def test
+  test do
     system "#{bin}/primesieve", '2', '1000', '--count=1', '-p2'
   end
 end
diff --git a/Library/Formula/pyqwt.rb b/Library/Formula/pyqwt.rb
index e37455a2d..c533d2bcf 100644
--- a/Library/Formula/pyqwt.rb
+++ b/Library/Formula/pyqwt.rb
@@ -30,7 +30,7 @@ class Pyqwt < Formula
     end
   end
 
-  def test
+  test do
     system "python", "-c", "from PyQt4 import Qwt5 as Qwt"
   end
 end
diff --git a/Library/Formula/qiv.rb b/Library/Formula/qiv.rb
index 9f0d144b0..fca01fa4c 100644
--- a/Library/Formula/qiv.rb
+++ b/Library/Formula/qiv.rb
@@ -18,7 +18,7 @@ class Qiv < Formula
     man1.install "qiv.1"
   end
 
-  def test
+  test do
     system "#{bin}/qiv"
   end
 end
diff --git a/Library/Formula/qtplay.rb b/Library/Formula/qtplay.rb
index 449b3e8a0..29c2ddfc9 100644
--- a/Library/Formula/qtplay.rb
+++ b/Library/Formula/qtplay.rb
@@ -12,7 +12,7 @@ class Qtplay < Formula
     man1.install 'qtplay.1'
   end
 
-  def test
+  test do
     system "#{bin}/qtplay", "--help"
   end
 end
diff --git a/Library/Formula/quex.rb b/Library/Formula/quex.rb
index a4ea1d127..8cfe1fff6 100644
--- a/Library/Formula/quex.rb
+++ b/Library/Formula/quex.rb
@@ -15,7 +15,7 @@ class Quex < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/quex", "--help"
   end
 end
diff --git a/Library/Formula/quvi.rb b/Library/Formula/quvi.rb
index 0045764b7..bc8165641 100644
--- a/Library/Formula/quvi.rb
+++ b/Library/Formula/quvi.rb
@@ -13,7 +13,7 @@ class Quvi < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/quvi", "--version"
   end
 end
diff --git a/Library/Formula/rc.rb b/Library/Formula/rc.rb
index cc0257548..aab8a4e5b 100644
--- a/Library/Formula/rc.rb
+++ b/Library/Formula/rc.rb
@@ -13,7 +13,7 @@ class Rc < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/rc", "-c", "echo Hello!"
   end
 end
diff --git a/Library/Formula/rdup.rb b/Library/Formula/rdup.rb
index 991f7805f..8628da40a 100644
--- a/Library/Formula/rdup.rb
+++ b/Library/Formula/rdup.rb
@@ -23,7 +23,7 @@ class Rdup < Formula
     system "make", "install"
   end
 
-  def test
+  test do
     # tell rdup to archive itself, then let rdup-tr make a tar archive of it,
     # and test with tar and grep whether the resulting tar archive actually
     # contains rdup
diff --git a/Library/Formula/regex-opt.rb b/Library/Formula/regex-opt.rb
index 8b12a801b..84bf74a36 100644
--- a/Library/Formula/regex-opt.rb
+++ b/Library/Formula/regex-opt.rb
@@ -15,7 +15,7 @@ class RegexOpt < Formula
     bin.install 'regex-opt'
   end
 
-  def test
+  test do
     system "#{bin}/regex-opt"
   end
 end
diff --git a/Library/Formula/remctl.rb b/Library/Formula/remctl.rb
index 35f530178..965525f95 100644
--- a/Library/Formula/remctl.rb
+++ b/Library/Formula/remctl.rb
@@ -14,7 +14,7 @@ class Remctl < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/remctl", "-v"
   end
 end
diff --git a/Library/Formula/rest-shell.rb b/Library/Formula/rest-shell.rb
index e3620ca90..b7e00465c 100644
--- a/Library/Formula/rest-shell.rb
+++ b/Library/Formula/rest-shell.rb
@@ -11,7 +11,7 @@ class RestShell < Formula
     bin.write_exec_script libexec/'bin/rest-shell'
   end
 
-  def test
+  test do
     system "#{bin}/rest-shell"
   end
 end
diff --git a/Library/Formula/roundup.rb b/Library/Formula/roundup.rb
index a264a9d52..6293a1bc7 100644
--- a/Library/Formula/roundup.rb
+++ b/Library/Formula/roundup.rb
@@ -17,7 +17,7 @@ class Roundup < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/roundup", "-v"
   end
 end
diff --git a/Library/Formula/rsense.rb b/Library/Formula/rsense.rb
index fbf91d1b8..3e35caad9 100644
--- a/Library/Formula/rsense.rb
+++ b/Library/Formula/rsense.rb
@@ -22,7 +22,7 @@ class Rsense < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/rsense", "version"
   end
 end
diff --git a/Library/Formula/rust.rb b/Library/Formula/rust.rb
index 71c1f62f6..1270c2f12 100644
--- a/Library/Formula/rust.rb
+++ b/Library/Formula/rust.rb
@@ -27,7 +27,7 @@ class Rust < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/rustc"
     system "#{bin}/rustdoc -h"
     system "#{bin}/rustpkg -v" unless build.head?
diff --git a/Library/Formula/sc68.rb b/Library/Formula/sc68.rb
index 66ed9699f..d5a754f00 100644
--- a/Library/Formula/sc68.rb
+++ b/Library/Formula/sc68.rb
@@ -13,7 +13,7 @@ class Sc68 < Formula
     system "make install"
   end
 
-  def test
+  test do
     # SC68 ships with a sample module; test attempts to print its metadata
     system "#{bin}/info68", "#{share}/sc68/Sample/About-Intro.sc68", "-C", ": ", "-N", "-L"
   end
diff --git a/Library/Formula/sdcc.rb b/Library/Formula/sdcc.rb
index feebb7855..e75df718e 100644
--- a/Library/Formula/sdcc.rb
+++ b/Library/Formula/sdcc.rb
@@ -30,7 +30,7 @@ class Sdcc < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/sdcc", "-v"
   end
 end
diff --git a/Library/Formula/sdhash.rb b/Library/Formula/sdhash.rb
index cad53932b..6a0ea67c6 100644
--- a/Library/Formula/sdhash.rb
+++ b/Library/Formula/sdhash.rb
@@ -16,7 +16,7 @@ class Sdhash < Formula
     man1.install Dir['man/*.1']
   end
 
-  def test
+  test do
     system "#{bin}/sdhash"
   end
 end
diff --git a/Library/Formula/sdl.rb b/Library/Formula/sdl.rb
index f6242daab..a88ccae21 100644
--- a/Library/Formula/sdl.rb
+++ b/Library/Formula/sdl.rb
@@ -63,7 +63,7 @@ class Sdl < Formula
     libexec.install Dir["src/main/macosx/*"] unless build.head?
   end
 
-  def test
+  test do
     system "#{bin}/sdl-config", "--version"
   end
 end
diff --git a/Library/Formula/sdl2.rb b/Library/Formula/sdl2.rb
index 2aaa35219..85cca463c 100644
--- a/Library/Formula/sdl2.rb
+++ b/Library/Formula/sdl2.rb
@@ -34,7 +34,7 @@ class Sdl2 < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/sdl2-config", "--version"
   end
 end
diff --git a/Library/Formula/silc-client.rb b/Library/Formula/silc-client.rb
index 9665a3af9..ddb81b8e9 100644
--- a/Library/Formula/silc-client.rb
+++ b/Library/Formula/silc-client.rb
@@ -22,7 +22,7 @@ class SilcClient < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/silc", "-v"
   end
 end
diff --git a/Library/Formula/slony.rb b/Library/Formula/slony.rb
index bbec7e378..79f492f37 100644
--- a/Library/Formula/slony.rb
+++ b/Library/Formula/slony.rb
@@ -15,7 +15,7 @@ class Slony < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "slon", "-v"
   end
 end
diff --git a/Library/Formula/sofia-sip.rb b/Library/Formula/sofia-sip.rb
index 302f74fc8..fcd0c9a4d 100644
--- a/Library/Formula/sofia-sip.rb
+++ b/Library/Formula/sofia-sip.rb
@@ -15,7 +15,7 @@ class SofiaSip < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/localinfo"
     system "#{bin}/sip-date"
   end
diff --git a/Library/Formula/sonar-runner.rb b/Library/Formula/sonar-runner.rb
index 9e3b5f027..d16c4128f 100644
--- a/Library/Formula/sonar-runner.rb
+++ b/Library/Formula/sonar-runner.rb
@@ -21,7 +21,7 @@ class SonarRunner < Formula
       EOS
   end
 
-  def test
+  test do
     system "#{bin}/sonar-runner", "-h"
   end
 end
diff --git a/Library/Formula/spark.rb b/Library/Formula/spark.rb
index 0ab91e587..d4f70d80b 100644
--- a/Library/Formula/spark.rb
+++ b/Library/Formula/spark.rb
@@ -9,7 +9,7 @@ class Spark < Formula
     bin.install "spark"
   end
 
-  def test
+  test do
     system "#{bin}/spark"
   end
 end
diff --git a/Library/Formula/spdylay.rb b/Library/Formula/spdylay.rb
index 51827b444..56c839a29 100644
--- a/Library/Formula/spdylay.rb
+++ b/Library/Formula/spdylay.rb
@@ -26,7 +26,7 @@ class Spdylay < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/spdycat", "-ns", "https://www.google.com"
   end
 end
diff --git a/Library/Formula/srmio.rb b/Library/Formula/srmio.rb
index 7b60c1743..541af25db 100644
--- a/Library/Formula/srmio.rb
+++ b/Library/Formula/srmio.rb
@@ -24,7 +24,7 @@ class Srmio < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/srmcmd", "--version"
   end
 end
diff --git a/Library/Formula/sslscan.rb b/Library/Formula/sslscan.rb
index 8837beac1..019f336fa 100644
--- a/Library/Formula/sslscan.rb
+++ b/Library/Formula/sslscan.rb
@@ -16,7 +16,7 @@ class Sslscan < Formula
     man1.install "sslscan.1"
   end
 
-  def test
+  test do
     system "#{bin}/sslscan"
   end
 end
diff --git a/Library/Formula/stanford-parser.rb b/Library/Formula/stanford-parser.rb
index 4ea1e2d67..06f954948 100644
--- a/Library/Formula/stanford-parser.rb
+++ b/Library/Formula/stanford-parser.rb
@@ -11,7 +11,7 @@ class StanfordParser < Formula
     bin.write_exec_script Dir["#{libexec}/*.sh"]
   end
 
-  def test
+  test do
     system "#{bin}/lexparser.sh", "#{libexec}/data/testsent.txt"
   end
 end
diff --git a/Library/Formula/swatchbooker.rb b/Library/Formula/swatchbooker.rb
index a9338b00c..62d54e901 100644
--- a/Library/Formula/swatchbooker.rb
+++ b/Library/Formula/swatchbooker.rb
@@ -25,7 +25,7 @@ class Swatchbooker < Formula
     chmod 0755, libexec/'bin/swatchbooker'
   end
 
-  def test
+  test do
     system "#{bin}/swatchbooker"
   end
 end
diff --git a/Library/Formula/swi-prolog.rb b/Library/Formula/swi-prolog.rb
index 0000af000..90829df26 100644
--- a/Library/Formula/swi-prolog.rb
+++ b/Library/Formula/swi-prolog.rb
@@ -65,7 +65,7 @@ class SwiProlog < Formula
     bin.write_exec_script Dir["#{libexec}/bin/*"]
   end
 
-  def test
+  test do
     system "#{bin}/swipl", "--version"
   end
 end
diff --git a/Library/Formula/ta-lib.rb b/Library/Formula/ta-lib.rb
index 96ded5ac7..3034c0521 100644
--- a/Library/Formula/ta-lib.rb
+++ b/Library/Formula/ta-lib.rb
@@ -15,7 +15,7 @@ class TaLib < Formula
     bin.install 'src/tools/ta_regtest/.libs/ta_regtest'
   end
 
-  def test
+  test do
     system "#{bin}/ta_regtest"
   end
 end
diff --git a/Library/Formula/tal.rb b/Library/Formula/tal.rb
index 160f64932..9934950e3 100644
--- a/Library/Formula/tal.rb
+++ b/Library/Formula/tal.rb
@@ -11,7 +11,7 @@ class Tal < Formula
     man1.install 'tal.1'
   end
 
-  def test
+  test do
     system "#{bin}/tal", "/etc/passwd"
   end
 end
diff --git a/Library/Formula/tcpurify.rb b/Library/Formula/tcpurify.rb
index 799eaed1a..ad3ba3bd6 100644
--- a/Library/Formula/tcpurify.rb
+++ b/Library/Formula/tcpurify.rb
@@ -10,7 +10,7 @@ class Tcpurify < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/tcpurify", "-v"
   end
 end
diff --git a/Library/Formula/teem.rb b/Library/Formula/teem.rb
index 92f1f9bc0..1ed788235 100644
--- a/Library/Formula/teem.rb
+++ b/Library/Formula/teem.rb
@@ -29,7 +29,7 @@ class Teem < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/nrrdSanity"
   end
 end
diff --git a/Library/Formula/tetgen.rb b/Library/Formula/tetgen.rb
index fa7bc2a5b..e95bcb5ea 100644
--- a/Library/Formula/tetgen.rb
+++ b/Library/Formula/tetgen.rb
@@ -12,7 +12,7 @@ class Tetgen < Formula
     lib.install 'libtet.a'
   end
 
-  def test
+  test do
     system "#{bin}/tetgen"
   end
 end
diff --git a/Library/Formula/texi2html.rb b/Library/Formula/texi2html.rb
index 5c5b533a1..95ac23fcb 100644
--- a/Library/Formula/texi2html.rb
+++ b/Library/Formula/texi2html.rb
@@ -19,7 +19,7 @@ class Texi2html < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/texi2html", "--help"
   end
 end
diff --git a/Library/Formula/the_silver_searcher.rb b/Library/Formula/the_silver_searcher.rb
index 6face8dcf..9d0ffcc8b 100644
--- a/Library/Formula/the_silver_searcher.rb
+++ b/Library/Formula/the_silver_searcher.rb
@@ -28,7 +28,7 @@ class TheSilverSearcher < Formula
     bash_completion.install 'ag.bashcomp.sh'
   end
 
-  def test
+  test do
     system "#{bin}/ag", "--version"
   end
 end
diff --git a/Library/Formula/tkdiff.rb b/Library/Formula/tkdiff.rb
index 049606982..0969b00ae 100644
--- a/Library/Formula/tkdiff.rb
+++ b/Library/Formula/tkdiff.rb
@@ -9,7 +9,7 @@ class Tkdiff < Formula
     bin.install 'tkdiff'
   end
 
-  def test
+  test do
     system "#{bin}/tkdiff", "--help"
   end
 end
diff --git a/Library/Formula/tmap.rb b/Library/Formula/tmap.rb
index 8d733c615..e086e26bc 100644
--- a/Library/Formula/tmap.rb
+++ b/Library/Formula/tmap.rb
@@ -40,7 +40,7 @@ class Tmap < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/tmap", "-v"
   end
 end
diff --git a/Library/Formula/tmux.rb b/Library/Formula/tmux.rb
index 108591ff8..329c12f66 100644
--- a/Library/Formula/tmux.rb
+++ b/Library/Formula/tmux.rb
@@ -42,7 +42,7 @@ class Tmux < Formula
     EOS
   end
 
-  def test
+  test do
     system "#{bin}/tmux", "-V"
   end
 end
diff --git a/Library/Formula/toilet.rb b/Library/Formula/toilet.rb
index ffba0c634..3d964ad6c 100644
--- a/Library/Formula/toilet.rb
+++ b/Library/Formula/toilet.rb
@@ -14,7 +14,7 @@ class Toilet < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/toilet", "--version"
   end
 end
diff --git a/Library/Formula/torrentcheck.rb b/Library/Formula/torrentcheck.rb
index fe3b2906f..8c546f279 100644
--- a/Library/Formula/torrentcheck.rb
+++ b/Library/Formula/torrentcheck.rb
@@ -11,7 +11,7 @@ class Torrentcheck < Formula
     bin.install 'torrentcheck'
   end
 
-  def test
+  test do
     system "#{bin}/torrentcheck"
   end
 end
diff --git a/Library/Formula/torsocks.rb b/Library/Formula/torsocks.rb
index c5450d143..b3661fe23 100644
--- a/Library/Formula/torsocks.rb
+++ b/Library/Formula/torsocks.rb
@@ -18,7 +18,7 @@ class Torsocks < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/torsocks"
   end
 end
diff --git a/Library/Formula/trafficserver.rb b/Library/Formula/trafficserver.rb
index 525380ed9..033f2220d 100644
--- a/Library/Formula/trafficserver.rb
+++ b/Library/Formula/trafficserver.rb
@@ -23,7 +23,7 @@ class Trafficserver < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/trafficserver", "status"
   end
 end
diff --git a/Library/Formula/trash.rb b/Library/Formula/trash.rb
index fdcbef2e6..3f277ac3e 100644
--- a/Library/Formula/trash.rb
+++ b/Library/Formula/trash.rb
@@ -14,7 +14,7 @@ class Trash < Formula
     man1.install "trash.1"
   end
 
-  def test
+  test do
     system "#{bin}/trash"
   end
 end
diff --git a/Library/Formula/treecc.rb b/Library/Formula/treecc.rb
index 2babf07ca..73c6c84cc 100644
--- a/Library/Formula/treecc.rb
+++ b/Library/Formula/treecc.rb
@@ -11,7 +11,7 @@ class Treecc < Formula
     bin.install "treecc"
   end
 
-  def test
+  test do
     system "#{bin}/treecc", "-v"
   end
 end
diff --git a/Library/Formula/tup.rb b/Library/Formula/tup.rb
index 076b936dd..f7913c63d 100644
--- a/Library/Formula/tup.rb
+++ b/Library/Formula/tup.rb
@@ -16,7 +16,7 @@ class Tup < Formula
     man1.install 'tup.1'
   end
 
-  def test
+  test do
     system "#{bin}/tup", "-v"
   end
 end
diff --git a/Library/Formula/txt2man.rb b/Library/Formula/txt2man.rb
index 290410914..49b40413f 100644
--- a/Library/Formula/txt2man.rb
+++ b/Library/Formula/txt2man.rb
@@ -12,7 +12,7 @@ class Txt2man < Formula
     bin.install %W[bookman src2man txt2man]
   end
 
-  def test
+  test do
     system "#{bin}/txt2man", "-h"
     system "#{bin}/src2man", "-h"
     system "#{bin}/bookman", "-h"
diff --git a/Library/Formula/uchardet.rb b/Library/Formula/uchardet.rb
index 4f92659e9..834073ed1 100644
--- a/Library/Formula/uchardet.rb
+++ b/Library/Formula/uchardet.rb
@@ -14,7 +14,7 @@ class Uchardet < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/uchardet", __FILE__
   end
 end
diff --git a/Library/Formula/ucspi-tcp.rb b/Library/Formula/ucspi-tcp.rb
index b2a1d5325..04a4017d8 100644
--- a/Library/Formula/ucspi-tcp.rb
+++ b/Library/Formula/ucspi-tcp.rb
@@ -18,7 +18,7 @@ class UcspiTcp < Formula
     share.install prefix/'man'
   end
 
-  def test
+  test do
     system "tcpserver"
   end
 end
diff --git a/Library/Formula/unar.rb b/Library/Formula/unar.rb
index f11045061..faf88e2db 100644
--- a/Library/Formula/unar.rb
+++ b/Library/Formula/unar.rb
@@ -36,7 +36,7 @@ class Unar < Formula
     end
   end
 
-  def test
+  test do
     system bin/'unar', '--version'
     system bin/'lsar', '--version'
   end
diff --git a/Library/Formula/unifdef.rb b/Library/Formula/unifdef.rb
index 53d7116b0..eeb04786b 100644
--- a/Library/Formula/unifdef.rb
+++ b/Library/Formula/unifdef.rb
@@ -12,7 +12,7 @@ class Unifdef < Formula
     system "make", "prefix=#{prefix}", "install"
   end
 
-  def test
+  test do
     system "echo '' | #{bin}/unifdef"
   end
 end
diff --git a/Library/Formula/uudeview.rb b/Library/Formula/uudeview.rb
index e3a22fd26..535a00c56 100644
--- a/Library/Formula/uudeview.rb
+++ b/Library/Formula/uudeview.rb
@@ -17,7 +17,7 @@ class Uudeview < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/uudeview", "-V"
   end
 end
diff --git a/Library/Formula/vala.rb b/Library/Formula/vala.rb
index 09d9beb6f..9a8224663 100644
--- a/Library/Formula/vala.rb
+++ b/Library/Formula/vala.rb
@@ -17,7 +17,7 @@ class Vala < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/valac", "--version"
   end
 end
diff --git a/Library/Formula/valgrind.rb b/Library/Formula/valgrind.rb
index 7431ce09f..fd383993d 100644
--- a/Library/Formula/valgrind.rb
+++ b/Library/Formula/valgrind.rb
@@ -68,7 +68,7 @@ class Valgrind < Formula
     system "make", "install"
   end
 
-  def test
+  test do
     system "#{bin}/valgrind", "ls", "-l"
   end
 end
diff --git a/Library/Formula/vimpc.rb b/Library/Formula/vimpc.rb
index ff5117447..57fdc0157 100644
--- a/Library/Formula/vimpc.rb
+++ b/Library/Formula/vimpc.rb
@@ -28,7 +28,7 @@ class Vimpc < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/vimpc", "-v"
   end
 end
diff --git a/Library/Formula/wait_on.rb b/Library/Formula/wait_on.rb
index 9e576a8f0..a4356a651 100644
--- a/Library/Formula/wait_on.rb
+++ b/Library/Formula/wait_on.rb
@@ -13,7 +13,7 @@ class WaitOn < Formula
     man1.install 'wait_on.1.gz'
   end
 
-  def test
+  test do
     system "#{bin}/wait_on", "-v"
   end
 end
diff --git a/Library/Formula/wbox.rb b/Library/Formula/wbox.rb
index 05c59d9d5..3e2732bdc 100644
--- a/Library/Formula/wbox.rb
+++ b/Library/Formula/wbox.rb
@@ -10,7 +10,7 @@ class Wbox < Formula
     bin.install "wbox"
   end
 
-  def test
+  test do
     system "#{bin}/wbox", "www.google.com", "1"
   end
 end
diff --git a/Library/Formula/wdfs.rb b/Library/Formula/wdfs.rb
index e7acddd17..646e50941 100644
--- a/Library/Formula/wdfs.rb
+++ b/Library/Formula/wdfs.rb
@@ -16,7 +16,7 @@ class Wdfs < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/wdfs", "-v"
   end
 end
diff --git a/Library/Formula/web100clt.rb b/Library/Formula/web100clt.rb
index 304e94db6..ee8a8da60 100644
--- a/Library/Formula/web100clt.rb
+++ b/Library/Formula/web100clt.rb
@@ -30,7 +30,7 @@ class Web100clt < Formula
     end
   end
 
-  def test
+  test do
     system "#{bin}/web100clt", "-v"
   end
 end
diff --git a/Library/Formula/wget.rb b/Library/Formula/wget.rb
index de262e632..3b22b84f0 100644
--- a/Library/Formula/wget.rb
+++ b/Library/Formula/wget.rb
@@ -47,7 +47,7 @@ class Wget < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/wget", "-O", "-", "www.google.com"
   end
 end
diff --git a/Library/Formula/wput.rb b/Library/Formula/wput.rb
index ba459e47d..416bf2d6b 100644
--- a/Library/Formula/wput.rb
+++ b/Library/Formula/wput.rb
@@ -19,7 +19,7 @@ class Wput < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/wput", "--version"
   end
 end
diff --git a/Library/Formula/xclip.rb b/Library/Formula/xclip.rb
index 0a18c9c62..21e4c046f 100644
--- a/Library/Formula/xclip.rb
+++ b/Library/Formula/xclip.rb
@@ -12,7 +12,7 @@ class Xclip < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/xclip", "-version"
   end
 end
diff --git a/Library/Formula/xmp.rb b/Library/Formula/xmp.rb
index f937d5c55..1ce7de98f 100644
--- a/Library/Formula/xmp.rb
+++ b/Library/Formula/xmp.rb
@@ -31,7 +31,7 @@ class Xmp < Formula
     share.install "ub-name.it" unless build.head?
   end
 
-  def test
+  test do
     system "#{bin}/xmp", "--load-only", share/"ub-name.it"
   end
 end
diff --git a/Library/Formula/xorriso.rb b/Library/Formula/xorriso.rb
index 2bff26f5b..b22fc6c98 100644
--- a/Library/Formula/xorriso.rb
+++ b/Library/Formula/xorriso.rb
@@ -12,7 +12,7 @@ class Xorriso < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/xorriso", "--help"
   end
 end
diff --git a/Library/Formula/xrootd.rb b/Library/Formula/xrootd.rb
index 36e82d0ca..06a67e30a 100644
--- a/Library/Formula/xrootd.rb
+++ b/Library/Formula/xrootd.rb
@@ -15,7 +15,7 @@ class Xrootd < Formula
     share.install prefix/'man'
   end
 
-  def test
+  test do
     system "#{bin}/xrootd", "-H"
   end
 end
diff --git a/Library/Formula/xstow.rb b/Library/Formula/xstow.rb
index 41e2c46a4..dc05d35b7 100644
--- a/Library/Formula/xstow.rb
+++ b/Library/Formula/xstow.rb
@@ -19,7 +19,7 @@ class Xstow < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/xstow", "-Version"
   end
 end
diff --git a/Library/Formula/xtail.rb b/Library/Formula/xtail.rb
index 01515daa5..3fe1a8b51 100644
--- a/Library/Formula/xtail.rb
+++ b/Library/Formula/xtail.rb
@@ -14,7 +14,7 @@ class Xtail < Formula
     system "make install"
   end
 
-  def test
+  test do
     system "#{bin}/xtail"
   end
 end
diff --git a/Library/Formula/yaws.rb b/Library/Formula/yaws.rb
index 58049a2c9..7149b83dd 100644
--- a/Library/Formula/yaws.rb
+++ b/Library/Formula/yaws.rb
@@ -44,7 +44,7 @@ class Yaws < Formula
     (var/'yaws/www').mkpath
   end
 
-  def test
+  test do
     system bin/'yaws', '--version'
   end
 
diff --git a/Library/Formula/youtube-dl.rb b/Library/Formula/youtube-dl.rb
index dd118ce61..d2d10ce67 100644
--- a/Library/Formula/youtube-dl.rb
+++ b/Library/Formula/youtube-dl.rb
@@ -18,7 +18,7 @@ class YoutubeDl < Formula
     "To use post-processing options, `brew install ffmpeg`."
   end
 
-  def test
+  test do
     system "#{bin}/youtube-dl", '--simulate', 'http://www.youtube.com/watch?v=he2a4xK8ctk'
   end
 end
diff --git a/Library/Formula/zabbix.rb b/Library/Formula/zabbix.rb
index 317eb7b59..16c2ec1ba 100644
--- a/Library/Formula/zabbix.rb
+++ b/Library/Formula/zabbix.rb
@@ -52,7 +52,7 @@ class Zabbix < Formula
     end
   end
 
-  def test
+  test do
     system "#{sbin}/zabbix_agentd", "--print"
   end
 end
diff --git a/Library/Formula/zsh.rb b/Library/Formula/zsh.rb
index bb5a652f9..8d0bd7b73 100644
--- a/Library/Formula/zsh.rb
+++ b/Library/Formula/zsh.rb
@@ -48,7 +48,7 @@ class Zsh < Formula
     system "make", "install.info"
   end
 
-  def test
+  test do
     system "#{bin}/zsh", "--version"
   end