diff --git a/bin/_mocha b/bin/_mocha
index 4ddbc08ff1..4873dc741f 100755
--- a/bin/_mocha
+++ b/bin/_mocha
@@ -81,16 +81,9 @@ program
   .option('--compilers <ext>:<module>,...', 'use the given module(s) to compile files', list, [])
   .option('--debug-brk', "enable node's debugger breaking on the first line")
   .option('--globals <names>', 'allow the given comma-delimited global [names]', list, [])
-  .option('--harmony', 'enable all harmony features (except typeof)')
   .option('--es_staging', 'enable all staged features')
-  .option('--harmony-collections', 'enable harmony collections (sets, maps, and weak maps)')
-  .option('--harmony-generators', 'enable harmony generators')
-  .option('--harmony-proxies', 'enable harmony proxies')
-  .option('--harmony_shipping', 'enable all shipped harmony fetaures (iojs)')
-  .option('--harmony_arrow_functions', 'enable "harmony arrow functions" (iojs)')
-  .option('--harmony_rest_parameters', 'enable "harmony rest parameters" (iojs)')
-  .option('--harmony_proxies', 'enable "harmony proxies" (iojs)')
-  .option('--harmony_classes', 'enable "harmony classes" (iojs)')
+  .option('--harmony', 'enable all harmony features (except typeof)')
+  .option('--harmony_<classes,generators,...>', 'all node --harmony* flags are available')
   .option('--inline-diffs', 'display actual/expected differences inline within each string')
   .option('--interfaces', 'display available interfaces')
   .option('--no-deprecation', 'silence deprecation warnings')
diff --git a/bin/mocha b/bin/mocha
index 3d87c9c6e9..123929e8f1 100755
--- a/bin/mocha
+++ b/bin/mocha
@@ -34,24 +34,7 @@ process.argv.slice(2).forEach(function(arg){
       args.unshift('--expose-gc');
       break;
     case '--gc-global':
-    case '--harmony':
     case '--es_staging':
-    case '--harmony_arrays':
-    case '--harmony_array_includes':
-    case '--harmony_arrow_functions':
-    case '--harmony_classes':
-    case '--harmony-collections':
-    case '--harmony_collections':
-    case '--harmony-generators':
-    case '--harmony_generators':
-    case '--harmony_modules':
-    case '--harmony-proxies':
-    case '--harmony_proxies':
-    case '--harmony_regexps':
-    case '--harmony_shipping':
-    case '--harmony_sloppy':
-    case '--harmony_rest_parameters':
-    case '--harmony_unicode':
     case '--no-deprecation':
     case '--prof':
     case '--throw-deprecation':
@@ -60,7 +43,8 @@ process.argv.slice(2).forEach(function(arg){
       args.unshift(arg);
       break;
     default:
-      if (0 == arg.indexOf('--trace')) args.unshift(arg);
+      if (0 == arg.indexOf('--harmony')) args.unshift(arg);
+      else if (0 == arg.indexOf('--trace')) args.unshift(arg);
       else if (0 == arg.indexOf('--max-old-space-size')) args.unshift(arg);
       else args.push(arg);
       break;