diff --git a/.travis.yml b/.travis.yml
index 957bd379..23227025 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -73,6 +73,7 @@ before_install:
     # Configure mocha for testing
     if   node_version_lt '0.10'; then npm_use_module 'mocha' '2.5.3'
     elif node_version_lt '4.0' ; then npm_use_module 'mocha' '3.5.3'
+    elif node_version_lt '6.0' ; then npm_use_module 'mocha' '5.2.0'
     fi
   - |
     # Configure supertest for http calls
diff --git a/package.json b/package.json
index d5c9918b..548331b2 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "eslint-plugin-standard": "4.0.0",
     "istanbul": "0.4.5",
     "methods": "1.1.2",
-    "mocha": "5.2.0",
+    "mocha": "6.0.2",
     "safe-buffer": "5.1.2",
     "supertest": "3.4.2"
   },