diff --git a/src/vs/code/electron-main/env.ts b/src/vs/code/electron-main/env.ts
index 0d31c08010b..51ea063ec88 100644
--- a/src/vs/code/electron-main/env.ts
+++ b/src/vs/code/electron-main/env.ts
@@ -30,7 +30,7 @@ export interface IProcessEnvironment {
 export interface ICommandLineArguments {
 	verbose: boolean;
 	debugPluginHost: string;
-	debugBrkExtensionHost: boolean;
+	debugBrkPluginHost: boolean;
 	debugBrkFileWatcherPort: number;
 	logExtensionHostCommunication: boolean;
 	disableExtensions: boolean;
@@ -173,7 +173,7 @@ export class EnvService implements IEnvService {
 			enablePerformance: argv.performance,
 			verbose: argv.verbose,
 			debugPluginHost,
-			debugBrkExtensionHost: !!debugBrkExtensionHostPort,
+			debugBrkPluginHost: !!debugBrkExtensionHostPort,
 			logExtensionHostCommunication: argv.logExtensionHostCommunication,
 			debugBrkFileWatcherPort: debugBrkFileWatcherPort,
 			openNewWindow: argv['new-window'],
@@ -188,7 +188,7 @@ export class EnvService implements IEnvService {
 			waitForWindowClose: argv.wait
 		});
 
-		this._isTestingFromCli = this.cliArgs.extensionTestsPath && !this.cliArgs.debugBrkExtensionHost;
+		this._isTestingFromCli = this.cliArgs.extensionTestsPath && !this.cliArgs.debugBrkPluginHost;
 		this._userHome = path.join(os.homedir(), product.dataFolderName);
 		this._userExtensionsHome = this.cliArgs.extensionsHomePath || path.join(this._userHome, 'extensions');
 
diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts
index e09823a2f1a..32858eff9f2 100644
--- a/src/vs/code/electron-main/window.ts
+++ b/src/vs/code/electron-main/window.ts
@@ -412,7 +412,7 @@ export class VSCodeWindow {
 			configuration.logExtensionHostCommunication = cli.logExtensionHostCommunication;
 			configuration.debugBrkFileWatcherPort = cli.debugBrkFileWatcherPort;
 			configuration.debugPluginHost = cli.debugPluginHost;
-			configuration.debugBrkExtensionHost = cli.debugBrkExtensionHost;
+			configuration.debugBrkPluginHost = cli.debugBrkPluginHost;
 			configuration.extensionsHomePath = cli.extensionsHomePath;
 		}
 
diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts
index 34d9ce31bb5..f4d6956cd6f 100644
--- a/src/vs/code/electron-main/windows.ts
+++ b/src/vs/code/electron-main/windows.ts
@@ -926,7 +926,7 @@ export class WindowsManager implements IWindowsService {
 				configuration.verbose = currentWindowConfig.verbose;
 				configuration.logExtensionHostCommunication = currentWindowConfig.logExtensionHostCommunication;
 				configuration.debugBrkFileWatcherPort = currentWindowConfig.debugBrkFileWatcherPort;
-				configuration.debugBrkExtensionHost = currentWindowConfig.debugBrkExtensionHost;
+				configuration.debugBrkPluginHost = currentWindowConfig.debugBrkPluginHost;
 				configuration.debugPluginHost = currentWindowConfig.debugPluginHost;
 				configuration.extensionsHomePath = currentWindowConfig.extensionsHomePath;
 			}
diff --git a/src/vs/platform/environment/common/environment.ts b/src/vs/platform/environment/common/environment.ts
index 8294435bef2..ee6a56cc776 100644
--- a/src/vs/platform/environment/common/environment.ts
+++ b/src/vs/platform/environment/common/environment.ts
@@ -23,6 +23,7 @@ export interface IEnvironmentService {
 	extensionDevelopmentPath: string;
 
 	debugExtensionHostPort: number;
+	debugBrkExtensionHost: boolean;
 
 	isBuilt: boolean;
 	verbose: boolean;
diff --git a/src/vs/platform/environment/node/environmentService.ts b/src/vs/platform/environment/node/environmentService.ts
index cd17a968ba7..00c422f0bce 100644
--- a/src/vs/platform/environment/node/environmentService.ts
+++ b/src/vs/platform/environment/node/environmentService.ts
@@ -42,10 +42,14 @@ export class EnvironmentService implements IEnvironmentService {
 	private _debugExtensionHostPort: number;
 	get debugExtensionHostPort(): number { return this._debugExtensionHostPort; }
 
+	private _debugBrkExtensionHost: boolean;
+	get debugBrkExtensionHost(): boolean { return this._debugBrkExtensionHost; }
+
 	get isBuilt(): boolean { return !process.env['VSCODE_DEV']; }
 	get verbose(): boolean { return this.args.verbose; }
 
-	get debugBrkFileWatcherPort(): number { return typeof this.args.debugBrkFileWatcherPort === 'string' ? Number(this.args.debugBrkFileWatcherPort) : void 0; }
+	private _debugBrkFileWatcherPort: number;
+	get debugBrkFileWatcherPort(): number { return this._debugBrkFileWatcherPort; }
 
 	constructor(private args: ParsedArgs) {
 		this._appRoot = path.dirname(URI.parse(require.toUrl('')).fsPath);
@@ -64,5 +68,9 @@ export class EnvironmentService implements IEnvironmentService {
 		if (args.debugPluginHost) {
 			this._debugExtensionHostPort = Number(args.debugPluginHost);
 		}
+
+		this._debugBrkExtensionHost = Boolean(args.debugBrkPluginHost);
+
+		this._debugBrkFileWatcherPort = (typeof args.debugBrkFileWatcherPort === 'string') ? Number(args.debugBrkFileWatcherPort) : void 0;
 	}
 }
\ No newline at end of file
diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts
index 79024aa448d..a21b5e07198 100644
--- a/src/vs/platform/workspace/common/workspace.ts
+++ b/src/vs/platform/workspace/common/workspace.ts
@@ -118,7 +118,6 @@ export interface IEnvironment {
 	appSettingsPath: string;
 	appKeybindingsPath: string;
 
-	debugBrkExtensionHost: boolean;
 	disableExtensions: boolean;
 
 	logExtensionHostCommunication: boolean;
diff --git a/src/vs/workbench/services/thread/electron-browser/threadService.ts b/src/vs/workbench/services/thread/electron-browser/threadService.ts
index 582ee84318a..52b43adda1d 100644
--- a/src/vs/workbench/services/thread/electron-browser/threadService.ts
+++ b/src/vs/workbench/services/thread/electron-browser/threadService.ts
@@ -114,8 +114,8 @@ class ExtensionHostProcessManager {
 		// handle extension host lifecycle a bit special when we know we are developing an extension that runs inside
 		const config = this.contextService.getConfiguration();
 		this.isExtensionDevelopmentHost = !!environmentService.extensionDevelopmentPath;
-		this.isExtensionDevelopmentDebugging = !!config.env.debugBrkExtensionHost;
-		this.isExtensionDevelopmentTestFromCli = this.isExtensionDevelopmentHost && !!config.env.extensionTestsPath && !config.env.debugBrkExtensionHost;
+		this.isExtensionDevelopmentDebugging = !!environmentService.debugBrkExtensionHost;
+		this.isExtensionDevelopmentTestFromCli = this.isExtensionDevelopmentHost && !!config.env.extensionTestsPath && !environmentService.debugBrkExtensionHost;
 
 		this.unsentMessages = [];
 		this.extensionHostProcessReady = false;