diff --git a/app/scripts.babel/popup.js b/app/scripts.babel/popup.js
index 6fd3dbda..1d762d15 100644
--- a/app/scripts.babel/popup.js
+++ b/app/scripts.babel/popup.js
@@ -723,7 +723,6 @@ limitations under the License.
         }, 2500);
       }
 
-
       konamiCanada(() => {
         k();
         console.log('O Canada!');
diff --git a/test/features/step_definitions/about.js b/test/features/step_definitions/about.js
index 5aa66108..66a18c79 100644
--- a/test/features/step_definitions/about.js
+++ b/test/features/step_definitions/about.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 const { Given, Then, When } = require('cucumber');
 const expect = require('chai').expect;
-const After = require('./support/hooks.js').After;
+const After = require('./support/hooks').After;
 
 Then(/I see the version number/, () => {
   $('#version').waitForDisplayed();
diff --git a/test/features/step_definitions/designer-live-preview.js b/test/features/step_definitions/designer-live-preview.js
index 4d532281..7eb93a2a 100644
--- a/test/features/step_definitions/designer-live-preview.js
+++ b/test/features/step_definitions/designer-live-preview.js
@@ -16,13 +16,13 @@ limitations under the License.
 
 const { Given, Then, When } = require('cucumber');
 const chai = require('chai');
-const login = require('./support/fixtures/auth.js').login;
-const findTabByTitle = require('./support/fixtures/nav.js').findTabByTitle;
-const modifyDashboard = require('./support/client.js').modifyDashboard;
-const getDashboard = require('./support/client.js').getDashboard;
-const After = require('./support/hooks.js').After;
-const AfterAll = require('./support/hooks.js').AfterAll;
-const Before = require('./support/hooks.js').Before;
+const login = require('./support/fixtures/auth').login;
+const findTabByTitle = require('./support/fixtures/nav').findTabByTitle;
+const modifyDashboard = require('./support/client').modifyDashboard;
+const getDashboard = require('./support/client').getDashboard;
+const After = require('./support/hooks').After;
+const AfterAll = require('./support/hooks').AfterAll;
+const Before = require('./support/hooks').Before;
 
 const assert = chai.assert;
 const expect = chai.expect;
diff --git a/test/features/step_definitions/display.js b/test/features/step_definitions/display.js
index d77c1b37..16b007ad 100644
--- a/test/features/step_definitions/display.js
+++ b/test/features/step_definitions/display.js
@@ -17,9 +17,9 @@ limitations under the License.
 const { Given, Then, When } = require('cucumber');
 const chrome = require('sinon-chrome');
 const chai = require('chai');
-const inject = require('./support/fixtures/mocks.js').inject;
-const login = require('./support/fixtures/auth.js').login;
-const After = require('./support/hooks.js').After;
+const inject = require('./support/fixtures/mocks').inject;
+const login = require('./support/fixtures/auth').login;
+const After = require('./support/hooks').After;
 
 const assert = chai.assert;
 const expect = chai.expect;
diff --git a/test/features/step_definitions/navigation.js b/test/features/step_definitions/navigation.js
index 63ff745d..757abd7e 100644
--- a/test/features/step_definitions/navigation.js
+++ b/test/features/step_definitions/navigation.js
@@ -17,13 +17,13 @@ limitations under the License.
 const { Given, Then, When } = require('cucumber');
 const chrome = require('sinon-chrome');
 const chai = require('chai');
-const create = require('./support/fixtures/documents.js').create;
-const init = require('./support/fixtures/documents.js').init;
-const inject = require('./support/fixtures/mocks.js').inject;
-const login = require('./support/fixtures/auth.js').login;
-const findTabByTitle = require('./support/fixtures/nav.js').findTabByTitle;
-const openNuxeo = require('./support/fixtures/nav.js').openNuxeo;
-const After = require('./support/hooks.js').After;
+const create = require('./support/fixtures/documents').create;
+const init = require('./support/fixtures/documents').init;
+const inject = require('./support/fixtures/mocks').inject;
+const login = require('./support/fixtures/auth').login;
+const findTabByTitle = require('./support/fixtures/nav').findTabByTitle;
+const openNuxeo = require('./support/fixtures/nav').openNuxeo;
+const After = require('./support/hooks').After;
 
 const nxPath = 'http://localhost:8080/nuxeo';
 const assert = chai.assert;
diff --git a/test/features/step_definitions/platform.js b/test/features/step_definitions/platform.js
index 814dc615..b8748b45 100644
--- a/test/features/step_definitions/platform.js
+++ b/test/features/step_definitions/platform.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 const { Given, Then, When } = require('cucumber');
 const chai = require('chai');
-const After = require('./support/hooks.js').After;
+const After = require('./support/hooks').After;
 
 const assert = chai.assert;
 const expect = chai.expect;
diff --git a/test/features/step_definitions/restart.js b/test/features/step_definitions/restart.js
index c437f536..ab95e7a9 100644
--- a/test/features/step_definitions/restart.js
+++ b/test/features/step_definitions/restart.js
@@ -17,7 +17,7 @@ limitations under the License.
 const { Given, Then, When } = require('cucumber');
 const expect = require('chai').expect;
 const Nuxeo = require('nuxeo');
-const After = require('./support/hooks.js').After;
+const After = require('./support/hooks').After;
 
 const nuxeo = new Nuxeo({
   baseURL: 'http://localhost:8080/nuxeo/',
diff --git a/test/features/step_definitions/search.js b/test/features/step_definitions/search.js
index 27e8d91d..fe896eed 100644
--- a/test/features/step_definitions/search.js
+++ b/test/features/step_definitions/search.js
@@ -16,7 +16,7 @@ limitations under the License.
 
 const { Given, Then, When } = require('cucumber');
 const expect = require('chai').expect;
-const After = require('./support/hooks.js').After;
+const After = require('./support/hooks').After;
 
 When(/I enter (.+) in (.+) input/, (text, selector) => {
   browser.$(`#${selector}`).addValue(text);
diff --git a/test/features/step_definitions/studio.js b/test/features/step_definitions/studio.js
index 583c83cb..0f8619b0 100644
--- a/test/features/step_definitions/studio.js
+++ b/test/features/step_definitions/studio.js
@@ -16,10 +16,10 @@ limitations under the License.
 
 const { Given, Then, When } = require('cucumber');
 const chai = require('chai');
-const login = require('./support/fixtures/auth.js').login;
-const modifyDashboard = require('./support/client.js').modifyDashboard;
-const After = require('./support/hooks.js').After;
-const AfterAll = require('./support/hooks.js').AfterAll;
+const login = require('./support/fixtures/auth').login;
+const modifyDashboard = require('./support/client').modifyDashboard;
+const After = require('./support/hooks').After;
+const AfterAll = require('./support/hooks').AfterAll;
 
 const assert = chai.assert;
 const expect = chai.expect;
diff --git a/test/features/step_definitions/support/fixtures/documents.js b/test/features/step_definitions/support/fixtures/documents.js
index dbbe47c6..477e131c 100644
--- a/test/features/step_definitions/support/fixtures/documents.js
+++ b/test/features/step_definitions/support/fixtures/documents.js
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-const nuxeo = require('./../client.js').nuxeo;
+const nuxeo = require('../client').nuxeo;
 
 function init(docType) {
   const title = `My_${docType}`;
diff --git a/test/features/step_definitions/support/hooks.js b/test/features/step_definitions/support/hooks.js
index 075e8b93..516831f9 100644
--- a/test/features/step_definitions/support/hooks.js
+++ b/test/features/step_definitions/support/hooks.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 const { After, AfterAll, Before } = require('cucumber');
-const revertDashboard = require('./client.js').revertDashboard;
+const revertDashboard = require('./client').revertDashboard;
 
 function isTagged(tag, scenario) {
   return scenario.pickle.tags.find((o) => o.name === tag);
diff --git a/test/features/step_definitions/toggles.js b/test/features/step_definitions/toggles.js
index 3d94f495..2c7f723f 100644
--- a/test/features/step_definitions/toggles.js
+++ b/test/features/step_definitions/toggles.js
@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 const { Given, Then, When } = require('cucumber');
-const After = require('./support/hooks.js').After;
+const After = require('./support/hooks').After;
 
 function toggleTraces(button, page) {
   if (page === 'Popup extension') {