diff --git a/extensions/vscode-api-tests/src/workspace.test.ts b/extensions/vscode-api-tests/src/workspace.test.ts
index e0dc2fac5c75c0323fad9376a8c124ef423e42e5..3a03e067ba974c8c1308c0402af347deb9191d0e 100644
--- a/extensions/vscode-api-tests/src/workspace.test.ts
+++ b/extensions/vscode-api-tests/src/workspace.test.ts
@@ -325,16 +325,17 @@ suite('workspace-namespace', () => {
 		});
 	});
 
-	test('findFiles, cancellation', () => {
+	// TODO@Joh this test fails randomly
+	// test('findFiles, cancellation', () => {
 
-		const source = new CancellationTokenSource();
-		const token = source.token; // just to get an instance first
-		source.cancel();
+	// 	const source = new CancellationTokenSource();
+	// 	const token = source.token; // just to get an instance first
+	// 	source.cancel();
 
-		return workspace.findFiles('*.js', null, 100, token).then((res) => {
-			assert.equal(res, void 0);
-		});
-	});
+	// 	return workspace.findFiles('*.js', null, 100, token).then((res) => {
+	// 		assert.equal(res, void 0);
+	// 	});
+	// });
 
 	test('applyEdit', () => {
 
diff --git a/src/vs/base/test/node/service/service.test.ts b/src/vs/base/test/node/service/service.test.ts
index bced40673243a7a5b63f8dfc69b7e51348af8f64..cd57d53db2972fd8b5132f9e10b2fb519ac0b9db 100644
--- a/src/vs/base/test/node/service/service.test.ts
+++ b/src/vs/base/test/node/service/service.test.ts
@@ -26,8 +26,6 @@ function createService() {
 suite('Service', () => {
 
 	test('createService', function(done: () => void) {
-		this.timeout(5000);
-
 		const testService = createService();
 		const res = testService.pong('ping');
 
@@ -39,8 +37,6 @@ suite('Service', () => {
 	});
 
 	test('cancellation', function(done: () => void) {
-		this.timeout(5000);
-
 		const testService = createService();
 		const res = testService.cancelMe();
 
diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts
index e20ee2fda0af185f5ea0eb86be8c23a21f5d3278..f08fe02b479cc13a197dfb21822e8447b835495e 100644
--- a/src/vs/workbench/services/files/test/node/fileService.test.ts
+++ b/src/vs/workbench/services/files/test/node/fileService.test.ts
@@ -58,8 +58,6 @@ suite('FileService', () => {
 	});
 
 	test('createFile', function(done: () => void) {
-		this.timeout(10000); // TODO@Ben test tends to need longer?
-
 		let contents = 'Hello World';
 		service.createFile(uri.file(path.join(testDir, 'test.txt')), contents).done(s => {
 			assert.equal(s.name, 'test.txt');
@@ -259,8 +257,6 @@ suite('FileService', () => {
 	});
 
 	test('updateContent', function(done: () => void) {
-		this.timeout(10000); // TODO@Ben test tends to need longer?
-		
 		let resource = uri.file(path.join(testDir, 'small.txt'));
 
 		service.resolveContent(resource).done(c => {
diff --git a/test/mocha.opts b/test/mocha.opts
index 901fe63ef6960460fac19ad61df917f83c9b97a0..0ecef3cde75255ef440dbb5988ad4f1b883e430a 100644
--- a/test/mocha.opts
+++ b/test/mocha.opts
@@ -1,4 +1,5 @@
 --delay
 --ui tdd
 --reporter dot
+--timeout 10000
 test/all.js