--- a/tools/mach_commands.py
+++ b/tools/mach_commands.py
@@ -285,19 +285,19 @@ class PastebinProvider(object):
         except urllib2.URLError:
             print('ERROR. Could not connect to pastebin.mozilla.org.')
             return 1
         return 0
 
 
 @CommandProvider
 class ReviewboardToolsProvider(MachCommandBase):
-    @Command('rbt', category='devenv',
+    @Command('rbt', category='devenv', allow_all_args=True,
         description='Run Reviewboard Tools')
-    @CommandArgument('args', nargs='*', help='Arguments to rbt tool')
+    @CommandArgument('args', nargs='...', help='Arguments to rbt tool')
     def rbt(self, args):
         if not args:
             args = ['help']
 
         self._activate_virtualenv()
         self.virtualenv_manager.install_pip_package('RBTools')
 
         from rbtools.commands.main import main