2 files changed, 14 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index f794e69..2f49678 100644
--- a/NEWS
+++ b/NEWS
@@ -6,9 +6,16 @@ This file summarizes changes between releases of cmdtest.
 Version 0.11, released UNRELEASED
 ---------------------------------
 
+For yarn:
+
 * Report number of scenarios skipped due to an ASSUMING step
   failing.
 
+For cmdtest:
+
+* The `--test` (`-t`) option should now work again. Thank you
+  to Kalle Valo for prodding me.
+
 Version 0.10, released 2013-10-05
 ---------------------------------
 
diff --git a/cmdtest b/cmdtest
index b8c6efa..d7f329e 100755
--- a/cmdtest
+++ b/cmdtest
@@ -120,6 +120,13 @@ class CommandTester(cliapp.Application):
         for test in self.settings['test']:
             matches = glob.glob(os.path.join(dirname, test + '.*'))
             filenames += [os.path.basename(x) for x in matches]
+
+        basenames = ['setup_once', 'setup', 'teardown', 'teardown_once']
+        for basename in basenames:
+            filename = os.path.join(dirname, basename)
+            if os.path.exists(filename):
+                filenames.append(basename)
+
         return filenames
 
     def setup_tempdir(self):