diff --git a/bin/expresso b/bin/expresso
index 2e10bbb..6eb7b12 100755
--- a/bin/expresso
+++ b/bin/expresso
@@ -1,5 +1,11 @@
 #!/usr/bin/env node
 
+/*
+ * A namespaced shim that allows me to run modules in both the browser and Node.
+ * See http://www.sitepen.com/blog/2010/09/30/run-anywhere-javascript-modules-boilerplate-code/
+ */
+ZC_DEFINE = typeof(define) == 'undefined';
+
 /*
  * Expresso
  * Copyright(c) TJ Holowaychuk <tj@vision-media.ca>
@@ -764,7 +770,7 @@ function runSuite(title, tests, fn) {
                                     next();
                                 });
                             } 
-                        });
+                        }, key);
                     } else {
                         test(function(fn){
                             process.addListener('beforeExit', function(){