diff --git a/.eslintrc.json b/.eslintrc.json
index df3c5ad560c..be9033a76e7 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -521,7 +521,8 @@
                     "vscode-textmate",
                     "vscode-oniguruma",
                     "iconv-lite-umd",
-                    "semver-umd"
+                    "semver-umd",
+                    "jschardet"
                 ]
             },
             {
@@ -550,7 +551,10 @@
                     "**/vs/workbench/api/{common,browser}/**",
                     "**/vs/workbench/services/**/{common,browser}/**",
                     "vscode-textmate",
-                    "vscode-oniguruma"
+                    "vscode-oniguruma",
+                    "iconv-lite-umd",
+                    "semver-umd",
+                    "jschardet"
                 ]
             },
             {
@@ -576,7 +580,12 @@
                     "**/vs/editor/**",
                     "**/vs/workbench/{common,browser,electron-sandbox}/**",
                     "**/vs/workbench/api/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/services/**/{common,browser,electron-sandbox}/**"
+                    "**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
+                    "vscode-textmate",
+                    "vscode-oniguruma",
+                    "iconv-lite-umd",
+                    "semver-umd",
+                    "jschardet"
                 ]
             },
             {
@@ -692,7 +701,12 @@
                     "**/vs/workbench/{common,browser}/**",
                     "**/vs/workbench/api/{common,browser}/**",
                     "**/vs/workbench/services/**/{common,browser}/**",
-                    "**/vs/workbench/contrib/**/{common,browser}/**"
+                    "**/vs/workbench/contrib/**/{common,browser}/**",
+                    "vscode-textmate",
+                    "vscode-oniguruma",
+                    "iconv-lite-umd",
+                    "semver-umd",
+                    "jschardet"
                 ]
             },
             {
@@ -721,7 +735,12 @@
                     "**/vs/workbench/{common,browser,electron-sandbox}/**",
                     "**/vs/workbench/api/{common,browser,electron-sandbox}/**",
                     "**/vs/workbench/services/**/{common,browser,electron-sandbox}/**",
-                    "**/vs/workbench/contrib/**/{common,browser,electron-sandbox}/**"
+                    "**/vs/workbench/contrib/**/{common,browser,electron-sandbox}/**",
+                    "vscode-textmate",
+                    "vscode-oniguruma",
+                    "iconv-lite-umd",
+                    "semver-umd",
+                    "jschardet"
                 ]
             },
             {
diff --git a/src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts b/src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
similarity index 100%
rename from src/vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution.ts
rename to src/vs/workbench/contrib/themes/browser/themes.test.contribution.ts
diff --git a/src/vs/workbench/contrib/themes/test/electron-browser/fixtures/foo.js b/src/vs/workbench/contrib/themes/test/electron-browser/fixtures/foo.js
deleted file mode 100644
index 469a6a71cb5..00000000000
--- a/src/vs/workbench/contrib/themes/test/electron-browser/fixtures/foo.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const webdriver = require('selenium-webdriver');
-
-function mergeObjects(target) {
-    var sources = [];
-    for (var _i = 1; _i < arguments.length; _i++) {
-        sources[_i - 1] = arguments[_i];
-    }
-    sources.forEach(function (source) {
-        for (var key in source) {
-            target[key] = source[key];
-        }
-    });
-    return target;
-}
\ No newline at end of file
diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts
index 4cba33ba087..0ab43c45ed8 100644
--- a/src/vs/workbench/workbench.desktop.main.ts
+++ b/src/vs/workbench/workbench.desktop.main.ts
@@ -109,9 +109,6 @@ import 'vs/workbench/contrib/performance/electron-browser/performance.contributi
 // CLI
 import 'vs/workbench/contrib/cli/node/cli.contribution';
 
-// Themes Support
-import 'vs/workbench/contrib/themes/test/electron-browser/themes.test.contribution';
-
 // Tasks
 import 'vs/workbench/contrib/tasks/electron-browser/taskService';
 
diff --git a/src/vs/workbench/workbench.sandbox.main.ts b/src/vs/workbench/workbench.sandbox.main.ts
index 1c47201d9cf..21d988533f1 100644
--- a/src/vs/workbench/workbench.sandbox.main.ts
+++ b/src/vs/workbench/workbench.sandbox.main.ts
@@ -86,4 +86,7 @@ import 'vs/workbench/contrib/remote/electron-sandbox/remote.contribution';
 // Configuration Exporter
 import 'vs/workbench/contrib/configExporter/electron-sandbox/configurationExportHelper.contribution';
 
+// Themes Support
+import 'vs/workbench/contrib/themes/browser/themes.test.contribution';
+
 //#endregion