diff --git a/config/babel/babelConfig.js b/config/babel/babelConfig.js
index ee9004d55..4536c13d2 100644
--- a/config/babel/babelConfig.js
+++ b/config/babel/babelConfig.js
@@ -58,6 +58,7 @@ module.exports = ({ target, lang = 'js' }) => {
 
   return {
     babelrc: false,
+    sourceType: 'unambiguous',
     presets: [
       languagePreset,
       [require.resolve('@babel/preset-env'), envPresetOptions],
diff --git a/test/test-cases/react-css-modules/react-css-modules.test.js b/test/test-cases/react-css-modules/react-css-modules.test.js
index e0d484753..a4d8c13a5 100644
--- a/test/test-cases/react-css-modules/react-css-modules.test.js
+++ b/test/test-cases/react-css-modules/react-css-modules.test.js
@@ -49,7 +49,7 @@ describe('react-css-modules', () => {
 
     it('should start a storybook server', async () => {
       const page = await browser.newPage();
-      await page.goto(storybookUrl);
+      await page.goto(storybookUrl, { waitUntil: 'networkidle2' });
 
       const content = await page.evaluate(async () => {
         const element = await window.document
diff --git a/test/test-cases/typescript-css-modules/typescript-css-modules.test.js b/test/test-cases/typescript-css-modules/typescript-css-modules.test.js
index 11ebcb639..21ed4f1b0 100644
--- a/test/test-cases/typescript-css-modules/typescript-css-modules.test.js
+++ b/test/test-cases/typescript-css-modules/typescript-css-modules.test.js
@@ -135,7 +135,7 @@ describe('typescript-css-modules', () => {
 
     it('should start a storybook server', async () => {
       const page = await browser.newPage();
-      await page.goto(storybookUrl);
+      await page.goto(storybookUrl, { waitUntil: 'networkidle2' });
 
       const content = await page.evaluate(async () => {
         const element = await window.document