diff --git a/.travis.yml b/.travis.yml
index 992e8e61c3..88481ec651 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,26 +6,30 @@ cache:
   directories:
   - node_modules
 node_js:
-- '6'
-- '5'
-- '4'
-script: 
-  - 'if [ -n "${LINT-}" ]; then make lint ; fi'
-  - 'if [ -z "${LINT-}" ]; then make test-ci ; fi'
-  - 'if [ -n "${FLOW-}" ]; then make flow ; fi'
+  - '6'
+  - '5'
+  - '4'
+
+env:
+  - JOB=test
+
+script:
+  - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
+  - 'if [ "$JOB" = "test-coverage" ]; then make test-ci-coverage; fi'
+  - 'if [ "$JOB" = "lint" ]; then make lint && make flow; fi'
 
 matrix:
   fast_finish: true
   include:
+    - node_js: "7"
+      env: JOB=test-coverage
     - node_js: "node"
-      env:
-        - LINT: true
-        - FLOW: true
-      
+      env: JOB=lint
+
 notifications:
-  on_success: change
-  on_failure: always
   slack:
+    on_success: change
+    on_failure: always
     rooms:
       # Generate with
       #     travis encrypt "babeljs:<token>#activity" --add notifications.slack.rooms
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5fc99aa50..7ff3de0e51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,11 +13,19 @@ _Note: Gaps between patch versions are faulty, broken or test releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 6.22.2 (2017-01-19)
+
+#### :bug: Bug Fix
+
+* `babel-cli`
+  * Fix issue with `babel-node` throwing errors when passed non-"-" args [#5162](https://github.com/babel/babel/pull/5162).
+
 ## 6.22.1 (2017-01-19)
 
 #### :bug: Bug Fix
 
-Temporary fix with `babel-traverse` via [#5019](https://github.com/babel/babel/pull/5019) for transform-react-constant-elements.
+* `babel-traverse`
+  * Temporary fix with `babel-traverse` via [#5019](https://github.com/babel/babel/pull/5019) for transform-react-constant-elements.
 
 ## 6.22.0 (2017-01-19)
 
diff --git a/Makefile b/Makefile
index 561846cef5..823878ed17 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ MAKEFLAGS = -j1
 
 export NODE_ENV = test
 
-.PHONY: build build-dist watch lint fix clean test-clean test-only test test-cov test-ci publish bootstrap
+.PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap
 
 build: clean
 	./node_modules/.bin/gulp build
@@ -16,7 +16,7 @@ build-dist: build
 
 watch: clean
 	rm -rf packages/*/lib
-	BABEL_ENV=development ./node_modules/.bin/gulp watch
+	./node_modules/.bin/gulp watch
 
 lint:
 	./node_modules/.bin/eslint packages/ --format=codeframe
@@ -42,22 +42,19 @@ clean-all:
 	rm -rf packages/*/node_modules
 	make clean
 
-# without lint
 test-only:
 	./scripts/test.sh
 	make test-clean
 
 test: lint test-only
 
-test-cov: clean
-	# rebuild with test
-	rm -rf packages/*/lib
-	BABEL_ENV=test ./node_modules/.bin/gulp build
-	./scripts/test-cov.sh
-
 test-ci:
 	NODE_ENV=test make bootstrap
-	make test-cov
+	make test-only
+
+test-ci-coverage:
+	NODE_ENV=test BABEL_ENV=cov make bootstrap
+	./scripts/test-cov.sh
 	./node_modules/.bin/codecov -f coverage/coverage-final.json
 
 publish:
@@ -68,7 +65,6 @@ publish:
 	# not using lerna independent mode atm, so only update packages that have changed since we use ^
 	./node_modules/.bin/lerna publish --only-explicit-updates
 	make clean
-	#./scripts/build-website.sh
 
 bootstrap:
 	make clean-all
diff --git a/lerna.json b/lerna.json
index d522a2967d..2858f12c31 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0-beta.23",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "changelog": {
     "repo": "babel/babel",
     "labels": {
diff --git a/package.json b/package.json
index 3df1640fee..b2cb44e7b8 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
       "transform-flow-strip-types"
     ],
     "env": {
-      "test": {
+      "cov": {
         "auxiliaryCommentBefore": "istanbul ignore next",
         "plugins": [
           "istanbul"
diff --git a/packages/babel-cli/package.json b/packages/babel-cli/package.json
index 9218555fde..4cecd9fe97 100644
--- a/packages/babel-cli/package.json
+++ b/packages/babel-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "babel-cli",
-  "version": "6.22.1",
+  "version": "6.22.2",
   "description": "Babel command line.",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
diff --git a/packages/babel-cli/src/_babel-node.js b/packages/babel-cli/src/_babel-node.js
index 032d1a1b03..bc71abb00d 100644
--- a/packages/babel-cli/src/_babel-node.js
+++ b/packages/babel-cli/src/_babel-node.js
@@ -102,7 +102,7 @@ if (program.eval || program.print) {
 
     let i = 0;
     let ignoreNext = false;
-    args.forEach(function (arg, i2) {
+    args.some(function (arg, i2) {
       if (ignoreNext) {
         ignoreNext = false;
         return;
@@ -115,7 +115,7 @@ if (program.eval || program.print) {
         }
       } else {
         i = i2;
-        return false;
+        return true;
       }
     });
     args = args.slice(i);