diff --git a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
index 342fa76c23c5cea5957560118ffb76ed8f0192c5..51c674aa00bebff581f362a457152bd5a2cb36cc 100644
--- a/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
+++ b/src/vs/workbench/services/search/test/node/textSearch.integrationTest.ts
@@ -8,28 +8,15 @@
 import path = require('path');
 import assert = require('assert');
 
-import { LineMatch } from 'vs/platform/search/common/search';
-
+import { TPromise } from 'vs/base/common/winjs.base';
 import { FileWalker } from 'vs/workbench/services/search/node/fileSearch';
-import { ISerializedFileMatch } from 'vs/workbench/services/search/node/search';
+import { ISerializedFileMatch, IRawSearch } from 'vs/workbench/services/search/node/search';
 import { Engine as TextSearchEngine } from 'vs/workbench/services/search/node/textSearch';
+import { RipgrepEngine } from 'vs/workbench/services/search/node/ripgrepTextSearch';
 import { TextSearchWorkerProvider } from 'vs/workbench/services/search/node/textSearchWorkerProvider';
 
 function countAll(matches: ISerializedFileMatch[]): number {
-	return matches.reduce((acc, m) => acc + count(m.lineMatches), 0);
-}
-
-function count(lineMatches: LineMatch[]): number {
-	let count = 0;
-	if (lineMatches) {
-		for (let i = 0; i < lineMatches.length; i++) {
-			let line = lineMatches[i];
-			let wordMatches = line.offsetAndLengths;
-			count += wordMatches.length;
-		}
-	}
-
-	return count;
+	return matches.reduce((acc, m) => acc + m.numMatches, 0);
 }
 
 function rootfolders() {
@@ -37,114 +24,103 @@ function rootfolders() {
 }
 
 const textSearchWorkerProvider = new TextSearchWorkerProvider();
-suite('Search-integration', () => {
-	test('Text: GameOfLife', function (done: () => void) {
-		let c = 0;
-		let config = {
-			rootFolders: rootfolders(),
-			filePattern: '*.js',
-			contentPattern: { pattern: 'GameOfLife', modifiers: 'i' }
-		};
 
+function doLegacySearchTest(config: IRawSearch, expectedResultCount: number | Function): TPromise<void> {
+	return new TPromise<void>(resolve => {
 		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
 
+		let c = 0;
 		engine.search((result) => {
 			if (result) {
 				c += countAll(result);
 			}
 		}, () => { }, (error) => {
 			assert.ok(!error);
-			assert.equal(c, 4);
-			done();
+			if (typeof expectedResultCount === 'function') {
+				assert(expectedResultCount(c));
+			} else {
+				assert.equal(c, expectedResultCount);
+			}
+			resolve(undefined);
 		});
 	});
+}
 
-	test('Text: GameOfLife (RegExp)', function (done: () => void) {
-		let c = 0;
-		let config = {
-			rootFolders: rootfolders(),
-			filePattern: '*.js',
-			contentPattern: { pattern: 'Game.?fL\\w?fe', isRegExp: true }
-		};
-
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
+function doRipgrepSearchTest(config: IRawSearch, expectedResultCount: number): TPromise<void> {
+	return new TPromise<void>(resolve => {
+		let engine = new RipgrepEngine(config);
 
+		let c = 0;
 		engine.search((result) => {
 			if (result) {
-				c += countAll(result);
+				c += result.numMatches;
 			}
 		}, () => { }, (error) => {
 			assert.ok(!error);
-			assert.equal(c, 4);
-			done();
+			assert.equal(c, expectedResultCount);
+			resolve(undefined);
 		});
 	});
+}
+
+function doSearchTest(config: IRawSearch, expectedResultCount: number, done) {
+	return doLegacySearchTest(config, expectedResultCount)
+		.then(() => doRipgrepSearchTest(config, expectedResultCount))
+		.then(done, done);
+}
+
+suite('Search-integration', () => {
+	test('Text: GameOfLife', function (done: () => void) {
+		let config = {
+			rootFolders: rootfolders(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'GameOfLife', modifiers: 'i' },
+		};
+
+		doSearchTest(config, 4, done);
+	});
+
+	test('Text: GameOfLife (RegExp)', function (done: () => void) {
+		let config = {
+			rootFolders: rootfolders(),
+			filePattern: '*.js',
+			contentPattern: { pattern: 'Game.?fL\\w?fe', isRegExp: true }
+		};
+
+		doSearchTest(config, 4, done);
+	});
 
 	test('Text: GameOfLife (Word Match, Case Sensitive)', function (done: () => void) {
-		let c = 0;
 		let config = {
 			rootFolders: rootfolders(),
 			filePattern: '*.js',
 			contentPattern: { pattern: 'GameOfLife', isWordMatch: true, isCaseSensitive: true }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, () => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 4);
-			done();
-		});
+		doSearchTest(config, 4, done);
 	});
 
 	test('Text: Helvetica (UTF 16)', function (done: () => void) {
-		let c = 0;
 		let config = {
 			rootFolders: rootfolders(),
 			filePattern: '*.css',
 			contentPattern: { pattern: 'Helvetica', modifiers: 'i' }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, () => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 3);
-			done();
-		});
+		doSearchTest(config, 3, done);
 	});
 
 	test('Text: e', function (done: () => void) {
-		let c = 0;
 		let config = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
 			contentPattern: { pattern: 'e', modifiers: 'i' }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 776);
-			done();
-		});
+		doSearchTest(config, 776, done);
 	});
 
 	test('Text: e (with excludes)', function (done: () => void) {
-		let c = 0;
 		let config: any = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
@@ -152,21 +128,10 @@ suite('Search-integration', () => {
 			excludePattern: { '**/examples': true }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 394);
-			done();
-		});
+		doSearchTest(config, 394, done);
 	});
 
 	test('Text: e (with includes)', function (done: () => void) {
-		let c = 0;
 		let config: any = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
@@ -174,21 +139,10 @@ suite('Search-integration', () => {
 			includePattern: { '**/examples/**': true }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 382);
-			done();
-		});
+		doSearchTest(config, 382, done);
 	});
 
 	test('Text: e (with includes and exclude)', function (done: () => void) {
-		let c = 0;
 		let config: any = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
@@ -197,62 +151,32 @@ suite('Search-integration', () => {
 			excludePattern: { '**/examples/small.js': true }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 361);
-			done();
-		});
+		doSearchTest(config, 361, done);
 	});
 
 	test('Text: a (capped)', function (done: () => void) {
-		let c = 0;
+		const maxResults = 520;
 		let config = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
 			contentPattern: { pattern: 'a', modifiers: 'i' },
-			maxResults: 520
+			maxResults
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-
-			// Search can go over the maxResults because it doesn't trim the results from its worker processes to the exact max size.
-			// But the worst-case scenario should be 2*max-1
-			assert.ok(c < 520 * 2);
-			done();
-		});
+		// (Legacy) search can go over the maxResults because it doesn't trim the results from its worker processes to the exact max size.
+		// But the worst-case scenario should be 2*max-1
+		return doLegacySearchTest(config, count => count < maxResults * 2)
+			.then(() => doRipgrepSearchTest(config, maxResults))
+			.then(done, done);
 	});
 
 	test('Text: a (no results)', function (done: () => void) {
-		let c = 0;
 		let config = {
 			rootFolders: rootfolders(),
 			filePattern: '*.*',
 			contentPattern: { pattern: 'ahsogehtdas', modifiers: 'i' }
 		};
 
-		let engine = new TextSearchEngine(config, new FileWalker(config), textSearchWorkerProvider);
-
-		engine.search((result) => {
-			if (result) {
-				c += countAll(result);
-			}
-		}, (result) => { }, (error) => {
-			assert.ok(!error);
-			assert.equal(c, 0);
-			done();
-		});
+		doSearchTest(config, 0, done);
 	});
 });
\ No newline at end of file