diff --git a/src/platform.js b/src/platform.js
index 4a1de391e..8f7bee842 100644
--- a/src/platform.js
+++ b/src/platform.js
@@ -37,7 +37,7 @@ var gAddonVars = null,
 var NOOP_CALLBACK = function (error) { if (error) debug(error); };
 
 function initialize(callback) {
-    if (process.env.BOX_ENV === 'test' && !process.env.CREATE_INFRA) return callback();
+    if (process.env.BOX_ENV === 'test' && !process.env.TEST_CREATE_INFRA) return callback();
 
     debug('initializing addon infrastructure');
 
diff --git a/src/routes/test/apps-test.js b/src/routes/test/apps-test.js
index ff872555e..18f7a2765 100644
--- a/src/routes/test/apps-test.js
+++ b/src/routes/test/apps-test.js
@@ -159,7 +159,7 @@ describe('Apps', function () {
     before(function (done) {
         config._reset();
 
-        process.env.CREATE_INFRA = 1;
+        process.env.TEST_CREATE_INFRA = 1;
 
         safe.fs.unlinkSync(paths.INFRA_VERSION_FILE);
         child_process.execSync('docker ps -qa | xargs --no-run-if-empty docker rm -f');
@@ -242,7 +242,7 @@ describe('Apps', function () {
     });
 
     after(function (done) {
-        delete process.env.CREATE_INFRA;
+        delete process.env.TEST_CREATE_INFRA;
 
         // child_process.execSync('docker ps -qa | xargs --no-run-if-empty docker rm -f');
         dockerProxy.close(function () { });