diff --git a/src/harness/runner.ts b/src/harness/runner.ts
index 7ea996b24e6..331a19819b3 100644
--- a/src/harness/runner.ts
+++ b/src/harness/runner.ts
@@ -68,17 +68,11 @@ if (testConfigFile !== '') {
                  runners.push(new GeneratedFourslashRunner());
                 break;
             case 'unittests':
-                runners.push(new UnitTestRunner(UnittestTestType.Compiler));
+                runners.push(new UnitTestRunner());
                 break;
             case 'rwc':
                 runners.push(new RWCRunner());
                 break;
-            case 'ls':
-                runners.push(new UnitTestRunner(UnittestTestType.LanguageService));
-                break;
-            case 'services':
-                runners.push(new UnitTestRunner(UnittestTestType.Services));
-                break;
             case 'reverse':
                 reverse = true;
                 break;
@@ -96,12 +90,12 @@ if (runners.length === 0) {
         runners.push(new ProjectRunner());
     }
 
-    //// language services
+    // language services
     runners.push(new FourslashRunner());
     //runners.push(new GeneratedFourslashRunner());
 
     // unittests
-    runners.push(new UnitTestRunner(UnittestTestType.Services));
+    runners.push(new UnitTestRunner());
 }
 
 sys.newLine = '\r\n';
diff --git a/src/harness/unittestrunner.ts b/src/harness/unittestrunner.ts
index 7b9019788e6..c91b82a0d96 100644
--- a/src/harness/unittestrunner.ts
+++ b/src/harness/unittestrunner.ts
@@ -1,34 +1,13 @@
 ///<reference path="harness.ts" />
 ///<reference path="runnerbase.ts" />
 
-enum UnittestTestType {
-    Compiler,
-    LanguageService,
-    Services,
-}
-
 class UnitTestRunner extends RunnerBase {
-    constructor(public testType: UnittestTestType) {
+    constructor() {
         super();
     }
 
     public initializeTests() {
-        switch (this.testType) {
-            case UnittestTestType.Compiler:
-                this.tests = this.enumerateFiles('tests/cases/unittests/compiler');
-                break;
-            case UnittestTestType.LanguageService:
-                this.tests = this.enumerateFiles('tests/cases/unittests/ls');
-                break;
-            case UnittestTestType.Services:
-                this.tests = this.enumerateFiles('tests/cases/unittests/services', /colorization.ts/);
-                break;
-            default:
-                if (this.tests.length === 0) {
-                    throw new Error('Unsupported test cases: ' + this.testType);
-                }
-                break;
-        }
+        this.tests = this.enumerateFiles('tests/cases/unittests/services');
 
         var outfile = new Harness.Compiler.WriterAggregator()
         var outerr = new Harness.Compiler.WriterAggregator();
@@ -63,7 +42,8 @@ class UnitTestRunner extends RunnerBase {
                 after: after,
                 Harness: Harness,
                 IO: Harness.IO,
-                ts:ts
+                ts: ts,
+                TypeScript: TypeScript
                 // FourSlash: FourSlash
             };
         }