diff --git a/tests/src/core/getExports.js b/tests/src/core/getExports.js
index 78b5319bb..1b0bb8273 100644
--- a/tests/src/core/getExports.js
+++ b/tests/src/core/getExports.js
@@ -187,6 +187,7 @@ describe('ExportMap', function () {
       jsdocTests({
         parserPath: 'espree',
         parserOptions: {
+          ecmaVersion: 2015,
           sourceType: 'module',
           attachComment: true,
         },
@@ -195,6 +196,7 @@ describe('ExportMap', function () {
       jsdocTests({
         parserPath: 'espree',
         parserOptions: {
+          ecmaVersion: 2015,
           sourceType: 'module',
           attachComment: true,
         },
@@ -206,6 +208,7 @@ describe('ExportMap', function () {
       jsdocTests({
         parserPath: 'babel-eslint',
         parserOptions: {
+          ecmaVersion: 2015,
           sourceType: 'module',
           attachComment: true,
         },
@@ -214,6 +217,7 @@ describe('ExportMap', function () {
       jsdocTests({
         parserPath: 'babel-eslint',
         parserOptions: {
+          ecmaVersion: 2015,
           sourceType: 'module',
           attachComment: true,
         },
@@ -223,8 +227,8 @@ describe('ExportMap', function () {
   })
 
   context('exported static namespaces', function () {
-    const espreeContext = { parserPath: 'espree', parserOptions: { sourceType: 'module' }, settings: {} }
-    const babelContext = { parserPath: 'babel-eslint', parserOptions: { sourceType: 'module' }, settings: {} }
+    const espreeContext = { parserPath: 'espree', parserOptions: { ecmaVersion: 2015, sourceType: 'module' }, settings: {} }
+    const babelContext = { parserPath: 'babel-eslint', parserOptions: { ecmaVersion: 2015, sourceType: 'module' }, settings: {} }
 
     it('works with espree & traditional namespace exports', function () {
       const path = getFilename('deep/a.js')
@@ -255,7 +259,7 @@ describe('ExportMap', function () {
   })
 
   context('deep namespace caching', function () {
-    const espreeContext = { parserPath: 'espree', parserOptions: { sourceType: 'module' }, settings: {} }
+    const espreeContext = { parserPath: 'espree', parserOptions: { ecmaVersion: 2015, sourceType: 'module' }, settings: {} }
     let a
     before('sanity check and prime cache', function (done) {
       // first version
diff --git a/tests/src/core/parse.js b/tests/src/core/parse.js
index 4b0f12c62..4d8b5ab58 100644
--- a/tests/src/core/parse.js
+++ b/tests/src/core/parse.js
@@ -20,7 +20,7 @@ describe('parse(content, { settings, ecmaFeatures })', function () {
   })
 
   it('infers jsx from ecmaFeatures when using stock parser', function () {
-    expect(() => parse(path, content, { settings: {}, parserPath: 'espree', parserOptions: { sourceType: 'module', ecmaFeatures: { jsx: true } } }))
+    expect(() => parse(path, content, { settings: {}, parserPath: 'espree', parserOptions: { ecmaVersion: 2015, sourceType: 'module', ecmaFeatures: { jsx: true } } }))
       .not.to.throw(Error)
   })
 
diff --git a/tests/src/rules/namespace.js b/tests/src/rules/namespace.js
index e642a2b48..f147ddc2c 100644
--- a/tests/src/rules/namespace.js
+++ b/tests/src/rules/namespace.js
@@ -25,6 +25,7 @@ const valid = [
     parserOptions: {
       sourceType: 'module',
       ecmaFeatures: { jsx: true },
+      ecmaVersion: 2015,
     },
   }),
   test({ code: "import * as foo from './common';" }),
diff --git a/tests/src/rules/newline-after-import.js b/tests/src/rules/newline-after-import.js
index 730cef363..490fad97d 100644
--- a/tests/src/rules/newline-after-import.js
+++ b/tests/src/rules/newline-after-import.js
@@ -65,63 +65,63 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           return somethingElse();
       }
     }`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import path from 'path';\nimport foo from 'foo';\n`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import path from 'path';import foo from 'foo';\n`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import path from 'path';import foo from 'foo';\n\nvar bar = 42;`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\n\nvar bar = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\n\n\nvar bar = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
       options: [{ 'count': 2 }],
     },
     {
       code: `import foo from 'foo';\n\n\n\n\nvar bar = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
       options: [{ 'count': 4 }],
     },
     {
       code: `var foo = require('foo-module');\n\nvar foo = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\n\n\nvar foo = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
       options: [{ 'count': 2 }],
     },
     {
       code: `var foo = require('foo-module');\n\n\n\n\nvar foo = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
       options: [{ 'count': 4 }],
     },
     {
       code: `require('foo-module');\n\nvar foo = 'bar';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\nimport { bar } from './bar-lib';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\n\nvar a = 123;\n\nimport { bar } from './bar-lib';`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\n\nvar a = 123;\n\nvar bar = require('bar-lib');`,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `
@@ -130,7 +130,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           foo();
         }
       `,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `
@@ -139,7 +139,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           foo();
         }
       `,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `
@@ -149,7 +149,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           var bar = 42;
         }
       `,
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `//issue 592
@@ -157,13 +157,13 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         @SomeDecorator(require('./some-file'))
         class App {}
       `,
-      parserOptions: { sourceType: 'module' },
-      parser: 'babel-eslint',
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
+      parser: require.resolve('babel-eslint'),
     },
     {
       code: `var foo = require('foo');\n\n@SomeDecorator(foo)\nclass Foo {}`,
-      parserOptions: { sourceType: 'module' },
-      parser: 'babel-eslint',
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
+      parser: require.resolve('babel-eslint'),
     },
   ],
 
@@ -176,7 +176,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\n\nexport default function() {};`,
@@ -187,7 +187,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE_MULTIPLE(2),
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\nvar something = 123;`,
@@ -197,7 +197,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: REQUIRE_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\nexport default function() {};`,
@@ -208,7 +208,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\nvar something = 123;`,
@@ -218,7 +218,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: REQUIRE_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\nvar a = 123;\n\nimport { bar } from './bar-lib';\nvar b=456;`,
@@ -234,7 +234,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE,
       }],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\nvar a = 123;\n\nvar bar = require('bar-lib');\nvar b=456;`,
@@ -250,7 +250,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           column: 1,
           message: REQUIRE_ERROR_MESSAGE,
         }],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var foo = require('foo-module');\nvar a = 123;\n\nrequire('bar-lib');\nvar b=456;`,
@@ -266,7 +266,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
           column: 1,
           message: REQUIRE_ERROR_MESSAGE,
         }],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `var path = require('path');\nvar foo = require('foo');\nvar bar = 42;`,
@@ -316,7 +316,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import path from 'path';import foo from 'foo';var bar = 42;`,
@@ -326,7 +326,7 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 25,
         message: IMPORT_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: `import foo from 'foo';\n@SomeDecorator(foo)\nclass Foo {}`,
@@ -336,8 +336,8 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: IMPORT_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
-      parser: 'babel-eslint',
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
+      parser: require.resolve('babel-eslint'),
     },
     {
       code: `var foo = require('foo');\n@SomeDecorator(foo)\nclass Foo {}`,
@@ -347,8 +347,8 @@ ruleTester.run('newline-after-import', require('rules/newline-after-import'), {
         column: 1,
         message: REQUIRE_ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' },
-      parser: 'babel-eslint',
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
+      parser: require.resolve('babel-eslint'),
     },
   ],
 })
diff --git a/tests/src/rules/no-amd.js b/tests/src/rules/no-amd.js
index 5b0e39f4f..d67739f71 100644
--- a/tests/src/rules/no-amd.js
+++ b/tests/src/rules/no-amd.js
@@ -4,8 +4,8 @@ var ruleTester = new RuleTester()
 
 ruleTester.run('no-amd', require('rules/no-amd'), {
   valid: [
-    { code: 'import "x";', parserOptions: { sourceType: 'module' } },
-    { code: 'import x from "x"', parserOptions: { sourceType: 'module' } },
+    { code: 'import "x";', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: 'import x from "x"', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
     'var x = require("x")',
 
     'require("x")',
diff --git a/tests/src/rules/no-commonjs.js b/tests/src/rules/no-commonjs.js
index c8155938b..ae0377f4a 100644
--- a/tests/src/rules/no-commonjs.js
+++ b/tests/src/rules/no-commonjs.js
@@ -9,14 +9,14 @@ ruleTester.run('no-commonjs', require('rules/no-commonjs'), {
   valid: [
 
     // imports
-    { code: 'import "x";', parserOptions: { sourceType: 'module' } },
-    { code: 'import x from "x"', parserOptions: { sourceType: 'module' } },
-    { code: 'import x from "x"', parserOptions: { sourceType: 'module' } },
-    { code: 'import { x } from "x"', parserOptions: { sourceType: 'module' } },
+    { code: 'import "x";', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: 'import x from "x"', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: 'import x from "x"', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: 'import { x } from "x"', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
 
     // exports
-    { code: 'export default "x"', parserOptions: { sourceType: 'module' } },
-    { code: 'export function house() {}', parserOptions: { sourceType: 'module' } },
+    { code: 'export default "x"', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: 'export function house() {}', parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
     {
       code:
       'function someFunc() {\n'+
@@ -24,7 +24,7 @@ ruleTester.run('no-commonjs', require('rules/no-commonjs'), {
       '\n'+
       '  expect(exports.someProp).toEqual({ a: \'value\' });\n'+
       '}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
 
     // allowed requires
diff --git a/tests/src/rules/no-namespace.js b/tests/src/rules/no-namespace.js
index c65f317c9..d9ef3423c 100644
--- a/tests/src/rules/no-namespace.js
+++ b/tests/src/rules/no-namespace.js
@@ -1,15 +1,15 @@
 import { RuleTester } from 'eslint'
 
-const ERROR_MESSAGE = 'Unexpected namespace import.';
+const ERROR_MESSAGE = 'Unexpected namespace import.'
 
 const ruleTester = new RuleTester()
 
 ruleTester.run('no-namespace', require('rules/no-namespace'), {
   valid: [
-    { code: "import { a, b } from 'foo';", parserOptions: { sourceType: 'module' } },
-    { code: "import { a, b } from './foo';", parserOptions: { sourceType: 'module' } },
-    { code: "import bar from 'bar';", parserOptions: { sourceType: 'module' } },
-    { code: "import bar from './bar';", parserOptions: { sourceType: 'module' } }
+    { code: "import { a, b } from 'foo';", parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: "import { a, b } from './foo';", parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: "import bar from 'bar';", parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
+    { code: "import bar from './bar';", parserOptions: { ecmaVersion: 2015, sourceType: 'module' } },
   ],
 
   invalid: [
@@ -18,27 +18,27 @@ ruleTester.run('no-namespace', require('rules/no-namespace'), {
       errors: [ {
         line: 1,
         column: 8,
-        message: ERROR_MESSAGE
+        message: ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' }
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: "import defaultExport, * as foo from 'foo';",
       errors: [ {
         line: 1,
         column: 23,
-        message: ERROR_MESSAGE
+        message: ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' }
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: "import * as foo from './foo';",
       errors: [ {
         line: 1,
         column: 8,
-        message: ERROR_MESSAGE
+        message: ERROR_MESSAGE,
       } ],
-      parserOptions: { sourceType: 'module' }
-    }
-  ]
-});
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
+    },
+  ],
+})
diff --git a/tests/src/rules/unambiguous.js b/tests/src/rules/unambiguous.js
index c1a89e829..b9455118e 100644
--- a/tests/src/rules/unambiguous.js
+++ b/tests/src/rules/unambiguous.js
@@ -10,46 +10,46 @@ ruleTester.run('unambiguous', rule, {
 
     {
       code: 'import y from "z"; function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'import * as y from "z"; function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'import { y } from "z"; function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'import z, { y } from "z"; function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'function x() {}; export {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'function x() {}; export { x }',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'function x() {}; export { y } from "z"',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'function x() {}; export * as y from "z"',
       parser: 'babel-eslint',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
     {
       code: 'export function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
     },
   ],
   invalid: [
     {
       code: 'function x() {}',
-      parserOptions: { sourceType: 'module' },
+      parserOptions: { ecmaVersion: 2015, sourceType: 'module' },
       errors: ['This module could be parsed as a valid script.'],
     },
   ],