diff --git a/.travis.yml b/.travis.yml
index 3f5ea78..c1474c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 {
     "sudo": false,
     "language": "node_js",
-    "node_js": ["5"],
+    "node_js": ["6"],
     "before_install": [
         "travis_retry pip install -r test-infra/requirements.txt --user",
         "rvm install 2.2",
diff --git a/src/cli.js b/src/cli.js
index c74d544..545b5b1 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -4,13 +4,13 @@
 
 var Deferred = require('bluebird');
 var chalk = require('chalk');
-var program = require('commander');
+var commander = require('commander');
 var readFile = Deferred.promisify(require('fs').readFile);
 var glob = Deferred.promisify(require('glob'));
 var bootlint = require('./bootlint');
 
 module.exports = function () {
-    program
+    var program = (new commander.Command('bootlint'))
         .version(require('../package.json').version)
         .description('Lint the HTML of Bootstrap projects')
         .usage('[options] [files...]')