diff --git a/spec/support/Casks/missing-homepage.rb b/spec/support/Casks/missing-homepage.rb
index dcc0ffb364c..ff924541d2e 100644
--- a/spec/support/Casks/missing-homepage.rb
+++ b/spec/support/Casks/missing-homepage.rb
@@ -1,4 +1,5 @@
 test_cask 'missing-homepage' do
-  url 'http://localhost/something.dmg'
   version '1.2.3'
+
+  url 'http://localhost/something.dmg'
 end
diff --git a/spec/support/Casks/missing-license.rb b/spec/support/Casks/missing-license.rb
index 921a4e0e0bf..30f3791c771 100644
--- a/spec/support/Casks/missing-license.rb
+++ b/spec/support/Casks/missing-license.rb
@@ -1,4 +1,5 @@
 test_cask 'missing-license' do
   version '1.2.3'
+
   url 'http://localhost/something.dmg'
 end
diff --git a/spec/support/Casks/missing-name.rb b/spec/support/Casks/missing-name.rb
index 019fcd106d0..a5265b37917 100644
--- a/spec/support/Casks/missing-name.rb
+++ b/spec/support/Casks/missing-name.rb
@@ -1,4 +1,5 @@
 test_cask 'missing-name' do
   version '1.2.3'
+
   url 'http://localhost/something.dmg'
 end
diff --git a/spec/support/Casks/missing-sha256.rb b/spec/support/Casks/missing-sha256.rb
index ff5da8c6c53..7f80279076a 100644
--- a/spec/support/Casks/missing-sha256.rb
+++ b/spec/support/Casks/missing-sha256.rb
@@ -1,4 +1,5 @@
 test_cask 'missing-sha256' do
   version '1.2.3'
+
   url 'http://localhost/something.dmg'
 end
diff --git a/spec/support/Casks/missing-url.rb b/spec/support/Casks/missing-url.rb
index ae002a35489..1b3e76b9ccf 100644
--- a/spec/support/Casks/missing-url.rb
+++ b/spec/support/Casks/missing-url.rb
@@ -1,4 +1,5 @@
 test_cask 'missing-url' do
   version '1.2.3'
+
   homepage 'http://example.com'
 end
diff --git a/spec/support/Casks/osdn-correct-url-format.rb b/spec/support/Casks/osdn-correct-url-format.rb
index 21b9bd236a4..da6ff0fcd2b 100644
--- a/spec/support/Casks/osdn-correct-url-format.rb
+++ b/spec/support/Casks/osdn-correct-url-format.rb
@@ -1,5 +1,6 @@
 test_cask 'osdn-correct-url-format' do
   version '1.2.3'
-  homepage 'http://osdn.jp/projects/something/'
+
   url 'http://user.dl.osdn.jp/something/id/Something-1.2.3.dmg'
+  homepage 'http://osdn.jp/projects/something/'
 end
diff --git a/spec/support/Casks/osdn-incorrect-url-format.rb b/spec/support/Casks/osdn-incorrect-url-format.rb
index bfd01633bb3..8400159a114 100644
--- a/spec/support/Casks/osdn-incorrect-url-format.rb
+++ b/spec/support/Casks/osdn-incorrect-url-format.rb
@@ -1,5 +1,6 @@
 test_cask 'osdn-incorrect-url-format' do
   version '1.2.3'
-  homepage 'http://osdn.jp/projects/something/'
+
   url 'http://osdn.jp/projects/something/files/Something-1.2.3.dmg/download'
+  homepage 'http://osdn.jp/projects/something/'
 end
diff --git a/spec/support/Casks/sourceforge-correct-url-format.rb b/spec/support/Casks/sourceforge-correct-url-format.rb
index 5386da6836c..0085fed9948 100644
--- a/spec/support/Casks/sourceforge-correct-url-format.rb
+++ b/spec/support/Casks/sourceforge-correct-url-format.rb
@@ -1,5 +1,6 @@
 test_cask 'sourceforge-correct-url-format' do
   version '1.2.3'
-  homepage 'http://sourceforge.net/projects/something/'
+
   url 'http://downloads.sourceforge.net/project/something/Something-1.2.3.dmg'
+  homepage 'http://sourceforge.net/projects/something/'
 end
diff --git a/spec/support/Casks/sourceforge-incorrect-url-format.rb b/spec/support/Casks/sourceforge-incorrect-url-format.rb
index d06e66e8317..27b5490b724 100644
--- a/spec/support/Casks/sourceforge-incorrect-url-format.rb
+++ b/spec/support/Casks/sourceforge-incorrect-url-format.rb
@@ -1,5 +1,6 @@
 test_cask 'sourceforge-incorrect-url-format' do
   version '1.2.3'
-  homepage 'http://sourceforge.net/projects/something/'
+
   url 'http://sourceforge.net/projects/something/files/Something-1.2.3.dmg/download'
+  homepage 'http://sourceforge.net/projects/something/'
 end
diff --git a/spec/support/Casks/sourceforge-version-latest-correct-url-format.rb b/spec/support/Casks/sourceforge-version-latest-correct-url-format.rb
index a43a42bc6b4..86ce75e00fb 100644
--- a/spec/support/Casks/sourceforge-version-latest-correct-url-format.rb
+++ b/spec/support/Casks/sourceforge-version-latest-correct-url-format.rb
@@ -1,5 +1,6 @@
 test_cask 'sourceforge-version-latest-correct-url-format' do
   version :latest
-  homepage 'http://sourceforge.net/projects/something/'
+
   url 'http://sourceforge.net/projects/something/files/latest/download'
+  homepage 'http://sourceforge.net/projects/something/'
 end
diff --git a/test/support/Casks/auto-updates.rb b/test/support/Casks/auto-updates.rb
index c12184d386f..f49060f8398 100644
--- a/test/support/Casks/auto-updates.rb
+++ b/test/support/Casks/auto-updates.rb
@@ -5,7 +5,7 @@ test_cask 'auto-updates' do
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/auto-updates'
 
-  app 'Transmission.app'
-
   auto_updates true
+
+  app 'Transmission.app'
 end
diff --git a/test/support/Casks/cab-container.rb b/test/support/Casks/cab-container.rb
index bc589d1a50a..55b213a523d 100644
--- a/test/support/Casks/cab-container.rb
+++ b/test/support/Casks/cab-container.rb
@@ -6,5 +6,6 @@ test_cask 'cab-container' do
   homepage 'http://example.com/cab-container'
 
   depends_on :formula => 'cabextract'
+
   app 'cabcontainer/Application.app'
 end
diff --git a/test/support/Casks/invalid/invalid-appcast-multiple.rb b/test/support/Casks/invalid/invalid-appcast-multiple.rb
index 71ca8871b74..8e25d0b1ed1 100644
--- a/test/support/Casks/invalid/invalid-appcast-multiple.rb
+++ b/test/support/Casks/invalid/invalid-appcast-multiple.rb
@@ -3,11 +3,11 @@ test_cask 'invalid-appcast-multiple' do
   sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
 
   url TestHelper.local_binary_url('caffeine.zip')
-  homepage 'http://example.com/invalid-appcast-multiple'
   appcast 'http://example.com/appcast1.xml',
           :sha256 => '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
   appcast 'http://example.com/appcast2.xml',
           :sha256 => '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  homepage 'http://example.com/invalid-appcast-multiple'
 
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/invalid/invalid-appcast-url.rb b/test/support/Casks/invalid/invalid-appcast-url.rb
index 513e2c8a742..5baef5f833e 100644
--- a/test/support/Casks/invalid/invalid-appcast-url.rb
+++ b/test/support/Casks/invalid/invalid-appcast-url.rb
@@ -3,9 +3,9 @@ test_cask 'invalid-appcast-url' do
   sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
 
   url TestHelper.local_binary_url('caffeine.zip')
-  homepage 'http://example.com/invalid-appcast-url'
   appcast 1,
           :sha256 => '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  homepage 'http://example.com/invalid-appcast-url'
 
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb b/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
index d4fe8d85b72..89942e4f4ed 100644
--- a/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
+++ b/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
@@ -5,7 +5,7 @@ test_cask 'invalid-gpg-conflicting-keys' do
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-conflicting-keys'
   gpg 'http://example.com/gpg-signature.asc',
-      :key_id => '01234567',
+      :key_id  => '01234567',
       :key_url => 'http://example.com/gpg-key-url'
 
   app 'Caffeine.app'
diff --git a/test/support/Casks/invalid/invalid-stage-only-conflict.rb b/test/support/Casks/invalid/invalid-stage-only-conflict.rb
index b14eda335d6..6efd64b22c2 100644
--- a/test/support/Casks/invalid/invalid-stage-only-conflict.rb
+++ b/test/support/Casks/invalid/invalid-stage-only-conflict.rb
@@ -5,6 +5,6 @@ test_cask 'invalid-stage-only-conflict' do
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/invalid-stage-only-conflict'
 
-  stage_only true
   app 'Transmission.app'
+  stage_only true
 end
diff --git a/test/support/Casks/nested-app.rb b/test/support/Casks/nested-app.rb
index e129f125a9e..73fa4f060f6 100644
--- a/test/support/Casks/nested-app.rb
+++ b/test/support/Casks/nested-app.rb
@@ -6,5 +6,6 @@ test_cask 'nested-app' do
   homepage 'http://example.com/nested-app'
 
   container :nested => 'NestedApp.dmg'
+
   app 'MyNestedApp.app'
 end
diff --git a/test/support/Casks/rar-container.rb b/test/support/Casks/rar-container.rb
index c12341124d1..87176efee54 100644
--- a/test/support/Casks/rar-container.rb
+++ b/test/support/Casks/rar-container.rb
@@ -6,5 +6,6 @@ test_cask 'rar-container' do
   homepage 'http://example.com/rar-container'
 
   depends_on :formula => 'unar'
+
   app 'rarcontainer/Application.app'
 end
diff --git a/test/support/Casks/sevenzip-container.rb b/test/support/Casks/sevenzip-container.rb
index ac7070cf757..60b3ed1a941 100644
--- a/test/support/Casks/sevenzip-container.rb
+++ b/test/support/Casks/sevenzip-container.rb
@@ -6,5 +6,6 @@ test_cask 'sevenzip-container' do
   homepage 'http://example.com/sevenzip-container'
 
   depends_on :formula => 'unar'
+
   app 'sevenzipcontainer/Application.app'
 end
diff --git a/test/support/Casks/stuffit-container.rb b/test/support/Casks/stuffit-container.rb
index 58270061480..1b2e6ba7163 100644
--- a/test/support/Casks/stuffit-container.rb
+++ b/test/support/Casks/stuffit-container.rb
@@ -6,5 +6,6 @@ test_cask 'stuffit-container' do
   homepage 'http://www.tobias-jung.de/seekingprofont/'
 
   depends_on :formula => 'unar'
+
   artifact 'sheldonmac/v1.0'
 end
diff --git a/test/support/Casks/with-accessibility-access.rb b/test/support/Casks/with-accessibility-access.rb
index bb512e7fe9f..1aa7bc8f7af 100644
--- a/test/support/Casks/with-accessibility-access.rb
+++ b/test/support/Casks/with-accessibility-access.rb
@@ -5,7 +5,7 @@ test_cask 'with-accessibility-access' do
   url 'http://example.com/TestCask.dmg'
   homepage 'http://example.com/'
 
-  app 'TestCask.app'
-
   accessibility_access true
+
+  app 'TestCask.app'
 end
diff --git a/test/support/Casks/with-appcast.rb b/test/support/Casks/with-appcast.rb
index 8eea677dcd8..f966222b3bf 100644
--- a/test/support/Casks/with-appcast.rb
+++ b/test/support/Casks/with-appcast.rb
@@ -3,9 +3,9 @@ test_cask 'with-appcast' do
   sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
 
   url TestHelper.local_binary_url('caffeine.zip')
-  homepage 'http://example.com/with-appcast'
   appcast 'http://example.com/appcast.xml',
           :sha256 => '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  homepage 'http://example.com/with-appcast'
 
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-caveats.rb b/test/support/Casks/with-caveats.rb
index 8b7150e4677..f61ab3313e3 100644
--- a/test/support/Casks/with-caveats.rb
+++ b/test/support/Casks/with-caveats.rb
@@ -6,6 +6,7 @@ test_cask 'with-caveats' do
   homepage 'http://example.com/local-caffeine'
 
   app 'Caffeine.app'
+
   # simple string is evaluated at compile-time
   caveats <<-EOS.undent
     Here are some things you might want to know.
diff --git a/test/support/Casks/with-conditional-caveats.rb b/test/support/Casks/with-conditional-caveats.rb
index 92e408261a0..8b7b19b72fa 100644
--- a/test/support/Casks/with-conditional-caveats.rb
+++ b/test/support/Casks/with-conditional-caveats.rb
@@ -6,6 +6,7 @@ test_cask 'with-conditional-caveats' do
   homepage 'http://example.com/local-caffeine'
 
   app 'Caffeine.app'
+
   # a do block may print and use a DSL
   caveats do
     puts 'This caveat is conditional' if false
diff --git a/test/support/Casks/with-conflicts-with.rb b/test/support/Casks/with-conflicts-with.rb
index 7848bd07126..b56b2920619 100644
--- a/test/support/Casks/with-conflicts-with.rb
+++ b/test/support/Casks/with-conflicts-with.rb
@@ -6,5 +6,6 @@ test_cask 'with-conflicts-with' do
   homepage 'http://example.com/with-conflicts-with'
 
   conflicts_with :formula => 'unar'
+
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-depends-on-cask.rb b/test/support/Casks/with-depends-on-cask.rb
index c7525c5dc08..0c68c298786 100644
--- a/test/support/Casks/with-depends-on-cask.rb
+++ b/test/support/Casks/with-depends-on-cask.rb
@@ -6,5 +6,6 @@ test_cask 'with-depends-on-cask' do
   homepage 'http://example.com/with-depends-on-cask'
 
   depends_on :cask => 'local-transmission'
+
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-depends-on-formula.rb b/test/support/Casks/with-depends-on-formula.rb
index 2788340e2ff..d41dda81e03 100644
--- a/test/support/Casks/with-depends-on-formula.rb
+++ b/test/support/Casks/with-depends-on-formula.rb
@@ -6,5 +6,6 @@ test_cask 'with-depends-on-formula' do
   homepage 'http://example.com/with-depends-on-formula'
 
   depends_on :formula => 'unar'
+
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-depends-on-macos-array.rb b/test/support/Casks/with-depends-on-macos-array.rb
index abe81912821..81ec43c0185 100644
--- a/test/support/Casks/with-depends-on-macos-array.rb
+++ b/test/support/Casks/with-depends-on-macos-array.rb
@@ -6,7 +6,7 @@ test_cask 'with-depends-on-macos-array' do
   homepage 'http://example.com/with-depends-on-macos-array'
 
   # since all OS releases are included, this should always pass
-  depends_on :macos => [ '10.0', '10.1', '10.2', '10.3', '10.3', '10.5', '10.6', '10.7', '10.8', '10.9', '10.10', MacOS.release.to_s ]
+  depends_on :macos => ['10.0', '10.1', '10.2', '10.3', '10.3', '10.5', '10.6', '10.7', '10.8', '10.9', '10.10', MacOS.release.to_s]
 
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-gpg-key-url.rb b/test/support/Casks/with-gpg-key-url.rb
index 86ea45d6646..d370f279893 100644
--- a/test/support/Casks/with-gpg-key-url.rb
+++ b/test/support/Casks/with-gpg-key-url.rb
@@ -6,5 +6,6 @@ test_cask 'with-gpg-key-url' do
   homepage 'http://example.com/with-gpg-key-url'
   gpg 'http://example.com/gpg-signature.asc',
       :key_url => 'http://example.com/gpg-key-url'
+
   app 'Caffeine.app'
 end
diff --git a/test/support/Casks/with-installable.rb b/test/support/Casks/with-installable.rb
index b9328d6009d..c897bb8c9db 100644
--- a/test/support/Casks/with-installable.rb
+++ b/test/support/Casks/with-installable.rb
@@ -6,14 +6,15 @@ test_cask 'with-installable' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'MyFancyPkg/Fancy.pkg'
+
   uninstall :script     => { :executable => 'MyFancyPkg/FancyUninstaller.tool', :args => %w[--please] },
             :quit       => 'my.fancy.package.app',
             :login_item => 'Fancy',
             :delete     => [
-                            '/permissible/absolute/path',
-                            '~/permissible/path/with/tilde',
-                            'impermissible/relative/path',
-                            '/another/impermissible/../relative/path',
+                             '/permissible/absolute/path',
+                             '~/permissible/path/with/tilde',
+                             'impermissible/relative/path',
+                             '/another/impermissible/../relative/path',
                            ],
-           :rmdir       => TestHelper.local_binary_path('empty_directory')
+            :rmdir      => TestHelper.local_binary_path('empty_directory')
 end
diff --git a/test/support/Casks/with-installer-script.rb b/test/support/Casks/with-installer-script.rb
index ceb556bddd9..fcfc7b0a076 100644
--- a/test/support/Casks/with-installer-script.rb
+++ b/test/support/Casks/with-installer-script.rb
@@ -9,7 +9,7 @@ test_cask 'with-installer-script' do
             :args   => ['--flag']
   # acceptable alternate form
   installer :script => {
-                        :executable => '/usr/bin/false',
-                        :args       => ['--flag'],
+                         :executable => '/usr/bin/false',
+                         :args       => ['--flag'],
                        }
 end
diff --git a/test/support/Casks/with-pkgutil-zap.rb b/test/support/Casks/with-pkgutil-zap.rb
index 90d7ed7c48d..c21bb121ba3 100644
--- a/test/support/Casks/with-pkgutil-zap.rb
+++ b/test/support/Casks/with-pkgutil-zap.rb
@@ -6,7 +6,8 @@ test_cask 'with-pkgutil-zap' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'Fancy.pkg'
-  zap :pkgutil => 'my.fancy.package.*',
-      :kext => 'my.fancy.package.kernelextension',
+
+  zap :pkgutil   => 'my.fancy.package.*',
+      :kext      => 'my.fancy.package.kernelextension',
       :launchctl => 'my.fancy.package.service'
 end
diff --git a/test/support/Casks/with-uninstall-delete.rb b/test/support/Casks/with-uninstall-delete.rb
index 65310843dfd..c98b9fd7b24 100644
--- a/test/support/Casks/with-uninstall-delete.rb
+++ b/test/support/Casks/with-uninstall-delete.rb
@@ -8,9 +8,9 @@ test_cask 'with-uninstall-delete' do
   pkg 'Fancy.pkg'
 
   uninstall :delete => [
-                        '/permissible/absolute/path',
-                        '~/permissible/path/with/tilde',
-                        'impermissible/relative/path',
-                        '/another/impermissible/../relative/path',
+                         '/permissible/absolute/path',
+                         '~/permissible/path/with/tilde',
+                         'impermissible/relative/path',
+                         '/another/impermissible/../relative/path',
                        ]
 end
diff --git a/test/support/Casks/with-uninstall-kext.rb b/test/support/Casks/with-uninstall-kext.rb
index d6be30fe690..1dae316cc9c 100644
--- a/test/support/Casks/with-uninstall-kext.rb
+++ b/test/support/Casks/with-uninstall-kext.rb
@@ -6,5 +6,6 @@ test_cask 'with-uninstall-kext' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'Fancy.pkg'
+
   uninstall :kext => 'my.fancy.package.kernelextension'
 end
diff --git a/test/support/Casks/with-uninstall-pkgutil.rb b/test/support/Casks/with-uninstall-pkgutil.rb
index f65586dc253..0b56660f7b8 100644
--- a/test/support/Casks/with-uninstall-pkgutil.rb
+++ b/test/support/Casks/with-uninstall-pkgutil.rb
@@ -6,5 +6,6 @@ test_cask 'with-uninstall-pkgutil' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'Fancy.pkg'
+
   uninstall :pkgutil => 'my.fancy.package.*'
 end
diff --git a/test/support/Casks/with-uninstall-rmdir.rb b/test/support/Casks/with-uninstall-rmdir.rb
index 58abc3daa97..b3c22c1b8ad 100644
--- a/test/support/Casks/with-uninstall-rmdir.rb
+++ b/test/support/Casks/with-uninstall-rmdir.rb
@@ -6,5 +6,6 @@ test_cask 'with-uninstall-rmdir' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'MyFancyPkg/Fancy.pkg'
+
   uninstall :rmdir => TestHelper.local_binary_path('empty_directory')
 end
diff --git a/test/support/Casks/with-uninstall-signal.rb b/test/support/Casks/with-uninstall-signal.rb
index b229ee9116c..07be877c4bb 100644
--- a/test/support/Casks/with-uninstall-signal.rb
+++ b/test/support/Casks/with-uninstall-signal.rb
@@ -8,7 +8,7 @@ test_cask 'with-uninstall-signal' do
   pkg 'MyFancyPkg/Fancy.pkg'
 
   uninstall :signal => [
-                        ['TERM', 'my.fancy.package.app'],
-                        ['KILL', 'my.fancy.package.app']
+                         ['TERM', 'my.fancy.package.app'],
+                         ['KILL', 'my.fancy.package.app'],
                        ]
 end
diff --git a/test/support/Casks/with-uninstall-trash.rb b/test/support/Casks/with-uninstall-trash.rb
index 2ccd2c39cd9..6fcf49de47f 100644
--- a/test/support/Casks/with-uninstall-trash.rb
+++ b/test/support/Casks/with-uninstall-trash.rb
@@ -8,9 +8,9 @@ test_cask 'with-uninstall-trash' do
   pkg 'Fancy.pkg'
 
   uninstall :trash => [
-                       '/permissible/absolute/path',
-                       '~/permissible/path/with/tilde',
-                       'impermissible/relative/path',
-                       '/another/impermissible/../relative/path',
+                        '/permissible/absolute/path',
+                        '~/permissible/path/with/tilde',
+                        'impermissible/relative/path',
+                        '/another/impermissible/../relative/path',
                       ]
 end
diff --git a/test/support/Casks/with-zap-delete.rb b/test/support/Casks/with-zap-delete.rb
index 3b2a5e8617c..8598fcb48d0 100644
--- a/test/support/Casks/with-zap-delete.rb
+++ b/test/support/Casks/with-zap-delete.rb
@@ -8,9 +8,9 @@ test_cask 'with-zap-delete' do
   pkg 'Fancy.pkg'
 
   zap :delete => [
-                        '/permissible/absolute/path',
-                        '~/permissible/path/with/tilde',
-                        'impermissible/relative/path',
-                        '/another/impermissible/../relative/path',
-                       ]
+                   '/permissible/absolute/path',
+                   '~/permissible/path/with/tilde',
+                   'impermissible/relative/path',
+                   '/another/impermissible/../relative/path',
+                 ]
 end
diff --git a/test/support/Casks/with-zap-kext.rb b/test/support/Casks/with-zap-kext.rb
index 74eb50eec04..754a6fe5e97 100644
--- a/test/support/Casks/with-zap-kext.rb
+++ b/test/support/Casks/with-zap-kext.rb
@@ -6,5 +6,6 @@ test_cask 'with-zap-kext' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'Fancy.pkg'
+
   zap :kext => 'my.fancy.package.kernelextension'
 end
diff --git a/test/support/Casks/with-zap-pkgutil.rb b/test/support/Casks/with-zap-pkgutil.rb
index 06dbf7b4663..986fde2ced7 100644
--- a/test/support/Casks/with-zap-pkgutil.rb
+++ b/test/support/Casks/with-zap-pkgutil.rb
@@ -6,5 +6,6 @@ test_cask 'with-zap-pkgutil' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'Fancy.pkg'
+
   zap :pkgutil => 'my.fancy.package.*'
 end
diff --git a/test/support/Casks/with-zap-rmdir.rb b/test/support/Casks/with-zap-rmdir.rb
index 81ca98704e4..76a019e5ecb 100644
--- a/test/support/Casks/with-zap-rmdir.rb
+++ b/test/support/Casks/with-zap-rmdir.rb
@@ -6,5 +6,6 @@ test_cask 'with-zap-rmdir' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'MyFancyPkg/Fancy.pkg'
+
   zap :rmdir => TestHelper.local_binary_path('empty_directory')
 end
diff --git a/test/support/Casks/with-zap-signal.rb b/test/support/Casks/with-zap-signal.rb
index 542e0599776..8d297d6b50e 100644
--- a/test/support/Casks/with-zap-signal.rb
+++ b/test/support/Casks/with-zap-signal.rb
@@ -8,7 +8,7 @@ test_cask 'with-zap-signal' do
   pkg 'MyFancyPkg/Fancy.pkg'
 
   zap :signal => [
-                        ['TERM', 'my.fancy.package.app'],
-                        ['KILL', 'my.fancy.package.app']
-                       ]
+                   ['TERM', 'my.fancy.package.app'],
+                   ['KILL', 'my.fancy.package.app'],
+                 ]
 end
diff --git a/test/support/Casks/with-zap-trash.rb b/test/support/Casks/with-zap-trash.rb
index e315b0a05f0..abc395e3c5c 100644
--- a/test/support/Casks/with-zap-trash.rb
+++ b/test/support/Casks/with-zap-trash.rb
@@ -8,9 +8,9 @@ test_cask 'with-zap-trash' do
   pkg 'Fancy.pkg'
 
   zap :trash => [
-                       '/permissible/absolute/path',
-                       '~/permissible/path/with/tilde',
-                       'impermissible/relative/path',
-                       '/another/impermissible/../relative/path',
-                      ]
+                  '/permissible/absolute/path',
+                  '~/permissible/path/with/tilde',
+                  'impermissible/relative/path',
+                  '/another/impermissible/../relative/path',
+                ]
 end
diff --git a/test/support/Casks/with-zap.rb b/test/support/Casks/with-zap.rb
index d169c182f5c..0b572b087f6 100644
--- a/test/support/Casks/with-zap.rb
+++ b/test/support/Casks/with-zap.rb
@@ -6,12 +6,14 @@ test_cask 'with-zap' do
   homepage 'http://example.com/fancy-pkg'
 
   pkg 'MyFancyPkg/Fancy.pkg'
+
   uninstall :quit => 'my.fancy.package.app.from.uninstall'
-  zap :script => {
-                  :executable => 'MyFancyPkg/FancyUninstaller.tool',
-                  :args => %w[--please]
-                  },
-      :quit => 'my.fancy.package.app',
+
+  zap :script     => {
+                       :executable => 'MyFancyPkg/FancyUninstaller.tool',
+                       :args       => %w[--please],
+                     },
+      :quit       => 'my.fancy.package.app',
       :login_item => 'Fancy',
-      :delete => '~/Library/Preferences/my.fancy.app.plist'
+      :delete     => '~/Library/Preferences/my.fancy.app.plist'
 end