diff --git a/packages/cli/tests/images/create.js b/packages/cli/tests/images/create.js
index 317308ec7..d6b4b02df 100644
--- a/packages/cli/tests/images/create.js
+++ b/packages/cli/tests/images/create.js
@@ -1,10 +1,10 @@
 const path = require('path');
 
 exports.default = [
+	// '.babelrc',
 	'.gitignore',
 	'package.json',
 	'README.md',
-	'src/.babelrc',
 	'src/assets/favicon.ico',
 	'src/assets/icons/android-chrome-192x192.png',
 	'src/assets/icons/android-chrome-512x512.png',
@@ -22,8 +22,8 @@ exports.default = [
 	'src/routes/profile/index.js',
 	'src/routes/profile/style.css',
 	'src/style/index.css',
-	'src/tests/__mocks__/browserMocks.js',
-	'src/tests/__mocks__/fileMocks.js',
-	'src/tests/header.test.js'
+	'tests/__mocks__/browserMocks.js',
+	'tests/__mocks__/fileMocks.js',
+	'tests/header.test.js'
 ].map(s => s.replace(/\//g, path.sep));
 
diff --git a/packages/cli/tests/lib/cli.js b/packages/cli/tests/lib/cli.js
index 257747742..88af91847 100644
--- a/packages/cli/tests/lib/cli.js
+++ b/packages/cli/tests/lib/cli.js
@@ -1,7 +1,8 @@
-const mkdirp = require('mkdirp');
 const { join } = require('path');
+const { existsSync, unlinkSync } = require('fs');
 const cmd = require('../../lib/commands');
 const { tmpDir } = require('./output');
+const mkdirp = require('mkdirp');
 
 const argv = {
 	_: [],
@@ -14,7 +15,15 @@ const argv = {
 exports.create = async function (template, name) {
 	let dest = tmpDir();
 	name = name || `test-${template}`;
+
 	await cmd.create(template, dest, { name, cwd:'.' });
+
+	// TODO: temporary – will resolve after 2.x->3.x release
+	// Templates are using 2.x, which needs `.babelrc` for TEST modification.
+	// The 3.x templates won't need `.babelrc` for { modules: commonjs }
+	let babelrc = join(dest, '.babelrc');
+	existsSync(babelrc) && unlinkSync(babelrc);
+
 	return dest;
 };