diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
index 64d3819250e72739e5e96bf8b44aa8b2950e95e9..fd81c6bf0247d206dcf570f13becb9456fff91a0 100644
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationEditingService.test.ts
@@ -39,7 +39,6 @@ import { NullLogService } from 'vs/platform/log/common/log';
 import { Schemas } from 'vs/base/common/network';
 import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
 import { IFileService } from 'vs/platform/files/common/files';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { HashService } from 'vs/workbench/services/hash/node/hashService';
 import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
 
@@ -62,7 +61,6 @@ suite('ConfigurationEditingService', () => {
 	let workspaceSettingsDir;
 
 	suiteSetup(() => {
-		setUnexpectedErrorHandler(() => null);
 		const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 		configurationRegistry.registerConfiguration({
 			'id': '_test',
diff --git a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
index b85a4bb87c0070ae3bf63b79e90988a506bc04f3..aa7c9bca598e38ed818fe371c6af6c1798fa34e2 100644
--- a/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
+++ b/src/vs/workbench/services/configuration/test/electron-browser/configurationService.test.ts
@@ -43,7 +43,6 @@ import { IRemoteAgentService } from 'vs/workbench/services/remote/common/remoteA
 import { FileService2 } from 'vs/workbench/services/files2/common/fileService2';
 import { NullLogService } from 'vs/platform/log/common/log';
 import { DiskFileSystemProvider } from 'vs/workbench/services/files2/node/diskFileSystemProvider';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { HashService } from 'vs/workbench/services/hash/node/hashService';
 import { ConfigurationCache } from 'vs/workbench/services/configuration/node/configurationCache';
 
@@ -462,7 +461,6 @@ suite('WorkspaceService - Initialization', () => {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
 	suiteSetup(() => {
-		setUnexpectedErrorHandler(() => null);
 		configurationRegistry.registerConfiguration({
 			'id': '_test',
 			'type': 'object',
@@ -727,7 +725,6 @@ suite('WorkspaceConfigurationService - Folder', () => {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
 	suiteSetup(() => {
-		setUnexpectedErrorHandler(() => null);
 		configurationRegistry.registerConfiguration({
 			'id': '_test',
 			'type': 'object',
@@ -1023,7 +1020,6 @@ suite('WorkspaceConfigurationService-Multiroot', () => {
 	const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
 
 	suiteSetup(() => {
-		setUnexpectedErrorHandler(() => null);
 		configurationRegistry.registerConfiguration({
 			'id': '_test',
 			'type': 'object',
diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
index 74ebd2640d149aec46398446f7826adecb781dec..8db57b2d13460c495d7f108081066c66a0628b13 100644
--- a/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
+++ b/src/vs/workbench/test/electron-browser/api/mainThreadConfiguration.test.ts
@@ -15,7 +15,6 @@ import { SingleProxyRPCProtocol } from './testRPCProtocol';
 import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration';
 import { WorkspaceService } from 'vs/workbench/services/configuration/node/configurationService';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-import { setUnexpectedErrorHandler } from 'vs/base/common/errors';
 
 suite('MainThreadConfiguration', function () {
 
@@ -26,7 +25,6 @@ suite('MainThreadConfiguration', function () {
 	let target: sinon.SinonSpy;
 
 	suiteSetup(() => {
-		setUnexpectedErrorHandler(() => null);
 		Registry.as<IConfigurationRegistry>(Extensions.Configuration).registerConfiguration({
 			'id': 'extHostConfiguration',
 			'title': 'a',