diff --git a/Jakefile.js b/Jakefile.js
index 3553600bf01ad..2019df45dc1db 100644
--- a/Jakefile.js
+++ b/Jakefile.js
@@ -486,7 +486,6 @@ function runConsoleTests(defaultReporter, runInParallel) {
             process.env.NODE_ENV = savedNodeEnv;
             Travis.measure(startTime);
             runLinterAndComplete();
-            finish();
         }, function (e, status) {
             process.env.NODE_ENV = savedNodeEnv;
             Travis.measure(startTime);
@@ -523,11 +522,11 @@ function runConsoleTests(defaultReporter, runInParallel) {
 
     function runLinterAndComplete() {
         if (!lintFlag || dirty) {
-            return;
+            return finish();
         }
         var lint = jake.Task['lint'];
-        lint.addListener('complete', function () {
-            complete();
+        lint.once('complete', function () {
+            finish();
         });
         lint.invoke();
     }
diff --git a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
index 6b9706810b55a..40bdb4eadabc9 160000
--- a/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
+++ b/tests/cases/user/TypeScript-Node-Starter/TypeScript-Node-Starter
@@ -1 +1 @@
-Subproject commit 6b9706810b55af326a93b9aa59cb17815a30bb32
+Subproject commit 40bdb4eadabc9fbed7d83e3f26817a931c0763b6