2 files changed, 3 insertions, 2 deletions
diff --git a/config/karma.config.js b/config/karma.config.js
index 2a5bf3581e0..7fba69fd28d 100644
--- a/config/karma.config.js
+++ b/config/karma.config.js
@@ -112,6 +112,7 @@ module.exports = function(config) {
   const karmaConfig = {
     basePath: ROOT_PATH,
     browsers: ['ChromeHeadlessCustom'],
+    concurrency: process.env.CI ? 2 : Infinity,
     client: {
       color: !process.env.CI,
     },
diff --git a/spec/javascripts/notes/components/note_app_spec.js b/spec/javascripts/notes/components/note_app_spec.js
index f04af04f852..ef876dc2941 100644
--- a/spec/javascripts/notes/components/note_app_spec.js
+++ b/spec/javascripts/notes/components/note_app_spec.js
@@ -195,7 +195,7 @@ describe('note_app', () => {
         setTimeout(() => {
           done();
         });
-      }, 2000);
+      });
     });
 
     describe('discussion note', () => {
@@ -230,7 +230,7 @@ describe('note_app', () => {
         setTimeout(() => {
           done();
         });
-      }, 2000);
+      });
     });
   });