diff --git a/.travis.yml b/.travis.yml
index a4b0fb3ab4..2bae948ca7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,10 @@ language: node_js
 sudo: false
 dist: trusty
 env:
-  - CXX=g++-4.8 DB=mongodb NODE_ENV=production
-  - CXX=g++-4.8 DB=mongodb NODE_ENV=development
-  - CXX=g++-4.8 DB=redis NODE_ENV=production
-  - CXX=g++-4.8 DB=postgres NODE_ENV=production
+  - CXX=g++-4.8 DB=mongodb TEST_ENV=production
+  - CXX=g++-4.8 DB=mongodb TEST_ENV=development
+  - CXX=g++-4.8 DB=redis TEST_ENV=production
+  - CXX=g++-4.8 DB=postgres TEST_ENV=production
 addons:
   apt:
     sources:
diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js
index c27f9a0790..537a880a9b 100644
--- a/test/mocks/databasemock.js
+++ b/test/mocks/databasemock.js
@@ -11,7 +11,7 @@ var path = require('path');
 var nconf = require('nconf');
 var url = require('url');
 
-global.env = process.env.NODE_ENV || 'production';
+global.env = process.env.TEST_ENV || 'production';
 
 var errorText;
 var packageInfo = require('../../package');