diff --git a/JavaScript/1-stub/runner.js b/JavaScript/1-stub/runner.js
index 5a2b1a4..be9a858 100644
--- a/JavaScript/1-stub/runner.js
+++ b/JavaScript/1-stub/runner.js
@@ -10,22 +10,16 @@ const start = (tests) => {
     }
     const test = tests.shift();
     console.log(`Started test: ${test.name}`);
-    try {
-      test((err) => {
-        if (err) {
-          failed++;
-          console.log(`Failed test: ${test.name}`);
-          console.log(err);
-        }
+    test((err) => {
+      if (err) {
+        failed++;
+        console.log(`Failed test: ${test.name}`);
+        console.log(err);
+      } else {
         console.log(`Finished test: ${test.name}`);
-        setTimeout(runNext, 0);
-      });
-    } catch (err) {
-      failed++;
-      console.log(`Failed test: ${test.name}`);
-      console.log(err);
+      }
       setTimeout(runNext, 0);
-    }
+    });
   };
   runNext();
 };
diff --git a/JavaScript/1-stub/tests.js b/JavaScript/1-stub/tests.js
index 63657f5..b3dab27 100644
--- a/JavaScript/1-stub/tests.js
+++ b/JavaScript/1-stub/tests.js
@@ -9,7 +9,6 @@ const runner = require('./runner.js');
 const testCreateTask = (next) => {
   const timer = setTimeout(() => {
     const err = new Error('Can not create task');
-    assert.fail(err);
     next(err);
   }, 200);
 
@@ -33,7 +32,6 @@ const testCreateTask = (next) => {
 const testExecuteTask = (next) => {
   const timer = setTimeout(() => {
     const err = new Error('Can not execute task');
-    assert.fail(err);
     next(err);
   }, 200);
 
@@ -57,7 +55,6 @@ const testExecuteTask = (next) => {
 const testFailedTask = (next) => {
   const timer = setTimeout(() => {
     const err = new Error('Task expected to fail');
-    assert.fail(err);
     next(err);
   }, 200);
 
@@ -74,10 +71,11 @@ const testFailedTask = (next) => {
       assert.strictEqual(err.message, 'Task failed');
     } catch (err) {
       error = err;
+    } finally {
+      clearTimeout(timer);
+      scheduler.stopAll();
+      next(error);
     }
-    clearTimeout(timer);
-    scheduler.stopAll();
-    next(error);
   });
 };