diff --git a/app/config.js b/app/config.js
index 1793e5006..2426ed100 100644
--- a/app/config.js
+++ b/app/config.js
@@ -13,8 +13,7 @@ angular.module('portainer').config([
   function ($urlRouterProvider, $httpProvider, localStorageServiceProvider, jwtOptionsProvider, $uibTooltipProvider, $compileProvider, cfpLoadingBarProvider) {
     'use strict';
 
-    var environment = '@@ENVIRONMENT';
-    if (environment === 'production') {
+    if (process.env.NODE_ENV === 'testing') {
       $compileProvider.debugInfoEnabled(false);
     }
 
diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js
index 9ab139442..6549ca71f 100644
--- a/app/portainer/views/init/admin/initAdminController.js
+++ b/app/portainer/views/init/admin/initAdminController.js
@@ -18,7 +18,7 @@ angular.module('portainer.app').controller('InitAdminController', [
       Username: 'admin',
       Password: '',
       ConfirmPassword: '',
-      enableTelemetry: true,
+      enableTelemetry: process.env.NODE_ENV === 'production',
     };
 
     $scope.state = {
diff --git a/gruntfile.js b/gruntfile.js
index 44e3cad2f..706cf24e8 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -2,6 +2,7 @@ var os = require('os');
 var loadGruntTasks = require('load-grunt-tasks');
 const webpackDevConfig = require('./webpack/webpack.develop');
 const webpackProdConfig = require('./webpack/webpack.production');
+const webpackTestingConfig = require('./webpack/webpack.testing');
 
 var arch = os.arch();
 if (arch === 'x64') arch = 'amd64';
@@ -78,7 +79,7 @@ module.exports = function (grunt) {
     ]);
   });
 
-  grunt.task.registerTask('devopsbuild', 'devopsbuild:<platform>:<arch>:env', function (p, a, env = 'prod') {
+  grunt.task.registerTask('devopsbuild', 'devopsbuild:<platform>:<arch>:<env>', function (p, a, env = 'prod') {
     grunt.task.run([
       'config:prod',
       `env:${env}`,
@@ -90,7 +91,7 @@ module.exports = function (grunt) {
       'shell:download_helm_binary:' + p + ':' + a,
       'shell:download_kompose_binary:' + p + ':' + a,
       'shell:download_kubectl_binary:' + p + ':' + a,
-      'webpack:prod',
+      `webpack:${env}`,
     ]);
   });
 };
@@ -114,6 +115,7 @@ gruntfile_cfg.webpack = {
   dev: webpackDevConfig,
   devWatch: Object.assign({ watch: true }, webpackDevConfig),
   prod: webpackProdConfig,
+  testing: webpackTestingConfig,
 };
 
 gruntfile_cfg.config = {
diff --git a/webpack/webpack.testing.js b/webpack/webpack.testing.js
new file mode 100644
index 000000000..819dd5ffd
--- /dev/null
+++ b/webpack/webpack.testing.js
@@ -0,0 +1,6 @@
+const webpackMerge = require('webpack-merge');
+const productionConfig = require('./webpack.production');
+
+module.exports = webpackMerge(productionConfig, {
+  optimization: { nodeEnv: 'testing' },
+});