From 1b5743f5fc7f1879e3f4a15938ec4c70bb2e6e09 Mon Sep 17 00:00:00 2001
From: Yannick Croissant <yannick.croissant@gmail.com>
Date: Mon, 8 May 2017 22:13:59 +0200
Subject: [PATCH] Update tests to pass parserOptions globally

---
 tests/lib/rules/display-name.js               |  43 +--
 tests/lib/rules/forbid-component-props.js     |  33 +--
 tests/lib/rules/forbid-elements.js            |  60 +---
 tests/lib/rules/forbid-foreign-prop-types.js  |  39 +--
 tests/lib/rules/forbid-prop-types.js          |  49 +--
 tests/lib/rules/jsx-boolean-value.js          |  20 +-
 .../lib/rules/jsx-closing-bracket-location.js | 279 +++++-------------
 tests/lib/rules/jsx-curly-spacing.js          | 223 +++++---------
 tests/lib/rules/jsx-equals-spacing.js         |  60 ++--
 tests/lib/rules/jsx-filename-extension.js     |  17 +-
 tests/lib/rules/jsx-first-prop-new-line.js    |  57 ++--
 tests/lib/rules/jsx-handler-names.js          |  44 +--
 tests/lib/rules/jsx-indent-props.js           |  25 +-
 tests/lib/rules/jsx-indent.js                 | 146 +++------
 tests/lib/rules/jsx-key.js                    |  46 ++-
 tests/lib/rules/jsx-max-props-per-line.js     |  72 ++---
 tests/lib/rules/jsx-no-bind.js                |  11 +-
 tests/lib/rules/jsx-no-comment-textnodes.js   |  27 +-
 tests/lib/rules/jsx-no-duplicate-props.js     |  42 +--
 tests/lib/rules/jsx-no-literals.js            |  26 +-
 tests/lib/rules/jsx-no-target-blank.js        |  32 +-
 tests/lib/rules/jsx-no-undef.js               |  51 ++--
 tests/lib/rules/jsx-pascal-case.js            |  47 +--
 tests/lib/rules/jsx-sort-props.js             | 126 ++++----
 tests/lib/rules/jsx-space-before-closing.js   |  50 +---
 tests/lib/rules/jsx-tag-spacing.js            |   8 +-
 tests/lib/rules/jsx-uses-react.js             |  20 +-
 tests/lib/rules/jsx-uses-vars.js              |  69 ++---
 tests/lib/rules/jsx-wrap-multilines.js        |  69 ++---
 tests/lib/rules/no-array-index-key.js         | 127 +++-----
 tests/lib/rules/no-children-prop.js           | 158 ++++------
 tests/lib/rules/no-danger-with-children.js    |  81 ++---
 tests/lib/rules/no-danger.js                  |  15 +-
 tests/lib/rules/no-deprecated.js              |  11 +-
 tests/lib/rules/no-did-mount-set-state.js     |  26 +-
 tests/lib/rules/no-did-update-set-state.js    |  26 +-
 tests/lib/rules/no-direct-mutation-state.js   |  23 +-
 tests/lib/rules/no-find-dom-node.js           |  21 +-
 tests/lib/rules/no-is-mounted.js              |  18 +-
 tests/lib/rules/no-multi-comp.js              |  19 +-
 tests/lib/rules/no-render-return-value.js     |  22 +-
 tests/lib/rules/no-set-state.js               |  18 +-
 tests/lib/rules/no-string-refs.js             |  32 +-
 tests/lib/rules/no-unescaped-entities.js      |  26 +-
 tests/lib/rules/no-unknown-property.js        |  58 ++--
 tests/lib/rules/no-unused-prop-types.js       | 249 +++++-----------
 tests/lib/rules/no-will-update-set-state.js   |  26 +-
 tests/lib/rules/prefer-es6-class.js           |  23 +-
 tests/lib/rules/prefer-stateless-function.js  |  42 +--
 tests/lib/rules/prop-types.js                 | 231 ++++-----------
 tests/lib/rules/react-in-jsx-scope.js         |  37 +--
 tests/lib/rules/require-default-props.js      |   9 +-
 tests/lib/rules/require-optimization.js       |  70 ++---
 tests/lib/rules/require-render-return.js      |  46 +--
 tests/lib/rules/self-closing-comp.js          |  71 ++---
 tests/lib/rules/sort-comp.js                  |  38 +--
 tests/lib/rules/sort-prop-types.js            |  70 ++---
 tests/lib/rules/style-prop-object.js          | 101 +++----
 .../rules/void-dom-elements-no-children.js    |  65 ++--
 59 files changed, 1240 insertions(+), 2310 deletions(-)

diff --git a/tests/lib/rules/display-name.js b/tests/lib/rules/display-name.js
index 253854022f..f11a005665 100644
--- a/tests/lib/rules/display-name.js
+++ b/tests/lib/rules/display-name.js
@@ -14,7 +14,8 @@ var RuleTester = require('eslint').RuleTester;
 require('babel-eslint');
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -25,7 +26,7 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('display-name', rule, {
 
   valid: [{
@@ -39,8 +40,7 @@ ruleTester.run('display-name', rule, {
     ].join('\n'),
     options: [{
       ignoreTranspilerName: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'var Hello = React.createClass({',
@@ -57,8 +57,7 @@ ruleTester.run('display-name', rule, {
       react: {
         createClass: 'createClass'
       }
-    },
-    parserOptions: parserOptions
+    }
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -70,8 +69,7 @@ ruleTester.run('display-name', rule, {
     ].join('\n'),
     options: [{
       ignoreTranspilerName: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class Hello {',
@@ -79,8 +77,7 @@ ruleTester.run('display-name', rule, {
       '    return \'Hello World\';',
       '  }',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class Hello extends Greetings {',
@@ -97,8 +94,7 @@ ruleTester.run('display-name', rule, {
       '  method;',
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -112,8 +108,7 @@ ruleTester.run('display-name', rule, {
     ].join('\n'),
     options: [{
       ignoreTranspilerName: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -126,8 +121,7 @@ ruleTester.run('display-name', rule, {
     options: [{
       ignoreTranspilerName: true
     }],
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -135,8 +129,7 @@ ruleTester.run('display-name', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -163,8 +156,7 @@ ruleTester.run('display-name', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'module.exports = createReactClass({',
@@ -173,8 +165,7 @@ ruleTester.run('display-name', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -188,8 +179,7 @@ ruleTester.run('display-name', rule, {
     ].join('\n'),
     options: [{
       ignoreTranspilerName: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'export default class {',
@@ -421,7 +411,6 @@ ruleTester.run('display-name', rule, {
     options: [{
       ignoreTranspilerName: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component definition is missing display name'
     }]
@@ -441,7 +430,6 @@ ruleTester.run('display-name', rule, {
         createClass: 'createClass'
       }
     },
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component definition is missing display name'
     }]
@@ -456,7 +444,6 @@ ruleTester.run('display-name', rule, {
     options: [{
       ignoreTranspilerName: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component definition is missing display name'
     }]
@@ -471,7 +458,6 @@ ruleTester.run('display-name', rule, {
     options: [{
       ignoreTranspilerName: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component definition is missing display name'
     }]
@@ -489,7 +475,6 @@ ruleTester.run('display-name', rule, {
     options: [{
       ignoreTranspilerName: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component definition is missing display name'
     }]
diff --git a/tests/lib/rules/forbid-component-props.js b/tests/lib/rules/forbid-component-props.js
index a9dc65d58a..ba4d2630ba 100644
--- a/tests/lib/rules/forbid-component-props.js
+++ b/tests/lib/rules/forbid-component-props.js
@@ -11,7 +11,8 @@ var rule = require('../../../lib/rules/forbid-component-props');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -27,7 +28,7 @@ require('babel-eslint');
 var CLASSNAME_ERROR_MESSAGE = 'Prop `className` is forbidden on Components';
 var STYLE_ERROR_MESSAGE = 'Prop `style` is forbidden on Components';
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('forbid-component-props', rule, {
 
   valid: [{
@@ -37,8 +38,7 @@ ruleTester.run('forbid-component-props', rule, {
       '    return <div className="foo" />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -47,8 +47,7 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    options: [{forbid: ['style']}],
-    parserOptions: parserOptions
+    options: [{forbid: ['style']}]
   }, {
     code: [
       'var First = createReactClass({',
@@ -57,8 +56,7 @@ ruleTester.run('forbid-component-props', rule, {
       '    return <Foo bar="baz" />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -68,8 +66,7 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    options: [{forbid: ['style']}],
-    parserOptions: parserOptions
+    options: [{forbid: ['style']}]
   }, {
     code: [
       'var First = createReactClass({',
@@ -79,8 +76,7 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    options: [{forbid: ['style', 'foo']}],
-    parserOptions: parserOptions
+    options: [{forbid: ['style', 'foo']}]
   }, {
     code: [
       'var First = createReactClass({',
@@ -89,8 +85,7 @@ ruleTester.run('forbid-component-props', rule, {
       '    return <this.Foo bar="baz" />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class First extends createReactClass {',
@@ -99,15 +94,13 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '}'
     ].join('\n'),
-    options: [{forbid: ['style']}],
-    parserOptions: parserOptions
+    options: [{forbid: ['style']}]
   }, {
     code: [
       'const First = (props) => (',
       '  <this.Foo {...props} />',
       ');'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -119,7 +112,6 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: CLASSNAME_ERROR_MESSAGE,
       line: 4,
@@ -135,7 +127,6 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: STYLE_ERROR_MESSAGE,
       line: 4,
@@ -151,7 +142,6 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [{forbid: ['className', 'style']}],
     errors: [{
       message: CLASSNAME_ERROR_MESSAGE,
@@ -168,7 +158,6 @@ ruleTester.run('forbid-component-props', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [{forbid: ['className', 'style']}],
     errors: [{
       message: STYLE_ERROR_MESSAGE,
diff --git a/tests/lib/rules/forbid-elements.js b/tests/lib/rules/forbid-elements.js
index 0ab7fcdc1f..080a441885 100644
--- a/tests/lib/rules/forbid-elements.js
+++ b/tests/lib/rules/forbid-elements.js
@@ -11,7 +11,8 @@ var rule = require('../../../lib/rules/forbid-elements');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -24,73 +25,60 @@ require('babel-eslint');
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('forbid-elements', rule, {
   valid: [
     {
       code: '<button />',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     },
     {
       code: '<button />',
-      options: [{forbid: []}],
-      parserOptions: parserOptions
+      options: [{forbid: []}]
     },
     {
       code: '<Button />',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: '<Button />',
-      options: [{forbid: [{element: 'button'}]}],
-      parserOptions: parserOptions
+      options: [{forbid: [{element: 'button'}]}]
     },
     {
       code: 'React.createElement(button)',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: 'createElement("button")',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: 'NotReact.createElement("button")',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: 'React.createElement("_thing")',
-      options: [{forbid: ['_thing']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['_thing']}]
     },
     {
       code: 'React.createElement("Modal")',
-      options: [{forbid: ['Modal']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['Modal']}]
     },
     {
       code: 'React.createElement("dotted.component")',
-      options: [{forbid: ['dotted.component']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['dotted.component']}]
     },
     {
       code: 'React.createElement(function() {})',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: 'React.createElement({})',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     },
     {
       code: 'React.createElement(1)',
-      options: [{forbid: ['button']}],
-      parserOptions: parserOptions
+      options: [{forbid: ['button']}]
     }
   ],
 
@@ -98,13 +86,11 @@ ruleTester.run('forbid-elements', rule, {
     {
       code: '<button />',
       options: [{forbid: ['button']}],
-      parserOptions: parserOptions,
       errors: [{message: '<button> is forbidden'}]
     },
     {
       code: '[<Modal />, <button />]',
       options: [{forbid: ['button', 'Modal']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<Modal> is forbidden'},
         {message: '<button> is forbidden'}
@@ -113,7 +99,6 @@ ruleTester.run('forbid-elements', rule, {
     {
       code: '<dotted.component />',
       options: [{forbid: ['dotted.component']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<dotted.component> is forbidden'}
       ]
@@ -123,7 +108,6 @@ ruleTester.run('forbid-elements', rule, {
       options: [{forbid: [
         {element: 'dotted.Component', message: 'that ain\'t cool'}
       ]}],
-      parserOptions: parserOptions,
       errors: [{message: '<dotted.Component> is forbidden, that ain\'t cool'}]
     },
     {
@@ -131,13 +115,11 @@ ruleTester.run('forbid-elements', rule, {
       options: [{forbid: [
         {element: 'button', message: 'use <Button> instead'}
       ]}],
-      parserOptions: parserOptions,
       errors: [{message: '<button> is forbidden, use <Button> instead'}]
     },
     {
       code: '<button><input /></button>',
       options: [{forbid: [{element: 'button'}, {element: 'input'}]}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<button> is forbidden'},
         {message: '<input> is forbidden'}
@@ -146,7 +128,6 @@ ruleTester.run('forbid-elements', rule, {
     {
       code: '<button><input /></button>',
       options: [{forbid: [{element: 'button'}, 'input']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<button> is forbidden'},
         {message: '<input> is forbidden'}
@@ -155,7 +136,6 @@ ruleTester.run('forbid-elements', rule, {
     {
       code: '<button><input /></button>',
       options: [{forbid: ['input', {element: 'button'}]}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<button> is forbidden'},
         {message: '<input> is forbidden'}
@@ -167,19 +147,16 @@ ruleTester.run('forbid-elements', rule, {
         {element: 'button', message: 'use <Button> instead'},
         {element: 'button', message: 'use <Button2> instead'}
       ]}],
-      parserOptions: parserOptions,
       errors: [{message: '<button> is forbidden, use <Button2> instead'}]
     },
     {
       code: 'React.createElement("button", {}, child)',
       options: [{forbid: ['button']}],
-      parserOptions: parserOptions,
       errors: [{message: '<button> is forbidden'}]
     },
     {
       code: '[React.createElement(Modal), React.createElement("button")]',
       options: [{forbid: ['button', 'Modal']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<Modal> is forbidden'},
         {message: '<button> is forbidden'}
@@ -190,13 +167,11 @@ ruleTester.run('forbid-elements', rule, {
       options: [{forbid: [
         {element: 'dotted.Component', message: 'that ain\'t cool'}
       ]}],
-      parserOptions: parserOptions,
       errors: [{message: '<dotted.Component> is forbidden, that ain\'t cool'}]
     },
     {
       code: 'React.createElement(dotted.component)',
       options: [{forbid: ['dotted.component']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<dotted.component> is forbidden'}
       ]
@@ -204,7 +179,6 @@ ruleTester.run('forbid-elements', rule, {
     {
       code: 'React.createElement(_comp)',
       options: [{forbid: ['_comp']}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<_comp> is forbidden'}
       ]
@@ -214,13 +188,11 @@ ruleTester.run('forbid-elements', rule, {
       options: [{forbid: [
         {element: 'button', message: 'use <Button> instead'}
       ]}],
-      parserOptions: parserOptions,
       errors: [{message: '<button> is forbidden, use <Button> instead'}]
     },
     {
       code: 'React.createElement("button", {}, React.createElement("input"))',
       options: [{forbid: [{element: 'button'}, {element: 'input'}]}],
-      parserOptions: parserOptions,
       errors: [
         {message: '<button> is forbidden'},
         {message: '<input> is forbidden'}
diff --git a/tests/lib/rules/forbid-foreign-prop-types.js b/tests/lib/rules/forbid-foreign-prop-types.js
index 1f08aec01c..74f4c89b30 100644
--- a/tests/lib/rules/forbid-foreign-prop-types.js
+++ b/tests/lib/rules/forbid-foreign-prop-types.js
@@ -11,9 +11,10 @@ var rule = require('../../../lib/rules/forbid-foreign-prop-types');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
   sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -26,39 +27,29 @@ require('babel-eslint');
 
 var ERROR_MESSAGE = 'Using another component\'s propTypes is forbidden';
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('forbid-foreign-prop-types', rule, {
 
   valid: [{
-    code: 'import { propTypes } from "SomeComponent";',
-    parserOptions: parserOptions
+    code: 'import { propTypes } from "SomeComponent";'
   }, {
-    code: 'import { propTypes as someComponentPropTypes } from "SomeComponent";',
-    parserOptions: parserOptions
+    code: 'import { propTypes as someComponentPropTypes } from "SomeComponent";'
   }, {
-    code: 'const foo = propTypes',
-    parserOptions: parserOptions
+    code: 'const foo = propTypes'
   }, {
-    code: 'foo(propTypes)',
-    parserOptions: parserOptions
+    code: 'foo(propTypes)'
   }, {
-    code: 'foo + propTypes',
-    parserOptions: parserOptions
+    code: 'foo + propTypes'
   }, {
-    code: 'const foo = [propTypes]',
-    parserOptions: parserOptions
+    code: 'const foo = [propTypes]'
   }, {
-    code: 'const foo = { propTypes }',
-    parserOptions: parserOptions
+    code: 'const foo = { propTypes }'
   }, {
-    code: 'Foo.propTypes = propTypes',
-    parserOptions: parserOptions
+    code: 'Foo.propTypes = propTypes'
   }, {
-    code: 'Foo["propTypes"] = propTypes',
-    parserOptions: parserOptions
+    code: 'Foo["propTypes"] = propTypes'
   }, {
-    code: 'const propTypes = "bar"; Foo[propTypes];',
-    parserOptions: parserOptions
+    code: 'const propTypes = "bar"; Foo[propTypes];'
   }],
 
   invalid: [{
@@ -70,7 +61,6 @@ ruleTester.run('forbid-foreign-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       type: 'Identifier'
@@ -85,7 +75,6 @@ ruleTester.run('forbid-foreign-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       type: 'Literal'
@@ -101,7 +90,6 @@ ruleTester.run('forbid-foreign-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       type: 'Property'
@@ -147,7 +135,6 @@ ruleTester.run('forbid-foreign-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       type: 'Property'
diff --git a/tests/lib/rules/forbid-prop-types.js b/tests/lib/rules/forbid-prop-types.js
index d615acb135..53aa736e40 100644
--- a/tests/lib/rules/forbid-prop-types.js
+++ b/tests/lib/rules/forbid-prop-types.js
@@ -11,7 +11,8 @@ var rule = require('../../../lib/rules/forbid-prop-types');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -29,7 +30,7 @@ var ARRAY_ERROR_MESSAGE = 'Prop type `array` is forbidden';
 var NUMBER_ERROR_MESSAGE = 'Prop type `number` is forbidden';
 var OBJECT_ERROR_MESSAGE = 'Prop type `object` is forbidden';
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('forbid-prop-types', rule, {
 
   valid: [{
@@ -39,8 +40,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -49,8 +49,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -64,8 +63,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -79,8 +77,7 @@ ruleTester.run('forbid-prop-types', rule, {
     ].join('\n'),
     options: [{
       forbid: ['any', 'object']
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'var First = createReactClass({',
@@ -94,8 +91,7 @@ ruleTester.run('forbid-prop-types', rule, {
     ].join('\n'),
     options: [{
       forbid: ['any', 'array']
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'var First = createReactClass({',
@@ -109,8 +105,7 @@ ruleTester.run('forbid-prop-types', rule, {
     ].join('\n'),
     options: [{
       forbid: ['any', 'array']
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class First extends React.Component {',
@@ -123,8 +118,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '  b: PropTypes.string',
       '};',
       'First.propTypes.justforcheck = PropTypes.string;'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class First extends React.Component {',
@@ -135,8 +129,7 @@ ruleTester.run('forbid-prop-types', rule, {
       'First.propTypes = {',
       '  elem: PropTypes.instanceOf(HTMLElement)',
       '};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -173,8 +166,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -186,8 +178,7 @@ ruleTester.run('forbid-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Proptypes declared with a spread property
     code: [
@@ -212,7 +203,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ANY_ERROR_MESSAGE,
       line: 3,
@@ -230,7 +220,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: NUMBER_ERROR_MESSAGE,
       line: 3,
@@ -251,7 +240,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ANY_ERROR_MESSAGE,
       line: 3,
@@ -269,7 +257,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ARRAY_ERROR_MESSAGE,
       line: 3,
@@ -287,7 +274,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ARRAY_ERROR_MESSAGE,
       line: 3,
@@ -305,7 +291,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: OBJECT_ERROR_MESSAGE,
       line: 3,
@@ -323,7 +308,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: OBJECT_ERROR_MESSAGE,
       line: 3,
@@ -342,7 +326,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -357,7 +340,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 1
   }, {
     code: [
@@ -378,7 +360,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -401,7 +382,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '    o: PropTypes.object',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 4
   }, {
     code: [
@@ -416,7 +396,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -430,7 +409,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [{
       forbid: ['instanceOf']
     }],
@@ -447,7 +425,6 @@ ruleTester.run('forbid-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [{
       forbid: ['object']
     }],
diff --git a/tests/lib/rules/jsx-boolean-value.js b/tests/lib/rules/jsx-boolean-value.js
index b83e6b211b..67ab4ddaed 100644
--- a/tests/lib/rules/jsx-boolean-value.js
+++ b/tests/lib/rules/jsx-boolean-value.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-boolean-value');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,24 +24,24 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-boolean-value', rule, {
   valid: [
-    {code: '<App foo />;', options: ['never'], parserOptions: parserOptions},
-    {code: '<App foo />;', parserOptions: parserOptions},
-    {code: '<App foo={true} />;', options: ['always'], parserOptions: parserOptions}
+    {code: '<App foo />;', options: ['never']},
+    {code: '<App foo />;'},
+    {code: '<App foo={true} />;', options: ['always']}
   ],
   invalid: [{
     code: '<App foo={true} />;', output: '<App foo />;', options: ['never'],
-    errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
+    errors: [{message: 'Value must be omitted for boolean attributes'}]
   }, {
     code: '<App foo={true} />;', output: '<App foo />;',
-    errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
+    errors: [{message: 'Value must be omitted for boolean attributes'}]
   }, {
     code: '<App foo = {true} />;', output: '<App foo />;',
-    errors: [{message: 'Value must be omitted for boolean attributes'}], parserOptions: parserOptions
+    errors: [{message: 'Value must be omitted for boolean attributes'}]
   }, {
     code: '<App foo />;', output: '<App foo={true} />;', options: ['always'],
-    errors: [{message: 'Value must be set for boolean attributes'}], parserOptions: parserOptions
+    errors: [{message: 'Value must be set for boolean attributes'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-closing-bracket-location.js b/tests/lib/rules/jsx-closing-bracket-location.js
index 0699da3184..e84db0da7f 100644
--- a/tests/lib/rules/jsx-closing-bracket-location.js
+++ b/tests/lib/rules/jsx-closing-bracket-location.js
@@ -10,14 +10,14 @@
 
 var rule = require('../../../lib/rules/jsx-closing-bracket-location');
 var RuleTester = require('eslint').RuleTester;
-
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
-
 var MESSAGE_AFTER_PROPS = [{message: 'The closing bracket must be placed after the last prop'}];
 var MESSAGE_AFTER_TAG = [{message: 'The closing bracket must be placed after the opening tag'}];
 
@@ -34,118 +34,102 @@ var messageWithDetails = function(message, expectedColumn, expectedNextLine) {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-closing-bracket-location', rule, {
   valid: [{
     code: [
       '<App />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App foo />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App ',
       '  foo',
       '/>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App foo />'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App foo />'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App foo />'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App ',
       '  foo />'
     ].join('\n'),
-    options: ['after-props'],
-    parserOptions: parserOptions
+    options: ['after-props']
   }, {
     code: [
       '<App ',
       '  foo',
       '  />'
     ].join('\n'),
-    options: ['props-aligned'],
-    parserOptions: parserOptions
+    options: ['props-aligned']
   }, {
     code: [
       '<App ',
       '  foo />'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App ',
       '  foo',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App ',
       '  foo',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App ',
       '  foo',
       '  />'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App foo></App>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App',
       '  foo',
       '></App>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App',
       '  foo',
       '></App>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App',
       '  foo',
       '  ></App>'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App',
@@ -153,8 +137,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '    console.log(\'bar\');',
       '  }} />'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App',
@@ -163,8 +146,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  }}',
       '  />'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App',
@@ -173,8 +155,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  }}',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App',
@@ -183,16 +164,14 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  }}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
       '  console.log(\'bar\');',
       '}}/>'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -200,8 +179,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '     }}',
       '     />'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -209,8 +187,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -218,8 +195,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider store>',
@@ -227,8 +203,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '    foo />',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'after-props'}]
   }, {
     code: [
       '<Provider ',
@@ -238,8 +213,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '    foo />',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'after-props'}]
   }, {
     code: [
       '<Provider ',
@@ -249,8 +223,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />',
       '</Provider>'
     ].join('\n'),
-    options: [{nonEmpty: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{nonEmpty: 'after-props'}]
   }, {
     code: [
       '<Provider store>',
@@ -259,8 +232,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '    />',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'props-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -271,8 +243,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />',
       '</Provider>'
     ].join('\n'),
-    options: [{nonEmpty: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{nonEmpty: 'props-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -283,8 +254,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '         </App>',
       '}'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -293,16 +263,14 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '         />',
       '}'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = <App',
       '  foo',
       '        />'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -313,8 +281,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />',
       '}'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       'var x = <App',
@@ -323,8 +290,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  }}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -337,8 +303,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />',
       '</Provider>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -351,8 +316,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />}',
       '</Provider>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App>',
@@ -367,8 +331,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     options: [{
       nonEmpty: false,
       selfClosing: 'after-props'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App>',
@@ -383,8 +346,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     options: [{
       nonEmpty: 'after-props',
       selfClosing: false
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<div className={[',
@@ -395,85 +357,74 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  Some text',
       '</div>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App ',
       '\tfoo',
       '/>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App ',
       '\tfoo />'
     ].join('\n'),
-    options: ['after-props'],
-    parserOptions: parserOptions
+    options: ['after-props']
   }, {
     code: [
       '<App ',
       '\tfoo',
       '\t/>'
     ].join('\n'),
-    options: ['props-aligned'],
-    parserOptions: parserOptions
+    options: ['props-aligned']
   }, {
     code: [
       '<App ',
       '\tfoo />'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App ',
       '\tfoo',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App ',
       '\tfoo',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App ',
       '\tfoo',
       '\t/>'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App',
       '\tfoo',
       '></App>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App',
       '\tfoo',
       '></App>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App',
       '\tfoo',
       '\t></App>'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App',
@@ -481,8 +432,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t\tconsole.log(\'bar\');',
       '\t}} />'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App',
@@ -491,8 +441,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t}}',
       '\t/>'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App',
@@ -501,8 +450,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App',
@@ -511,16 +459,14 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
       '\tconsole.log(\'bar\');',
       '}}/>'
     ].join('\n'),
-    options: [{location: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{location: 'after-props'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -528,8 +474,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t\t}}',
       '     />'
     ].join('\n'),
-    options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'props-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -537,8 +482,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       '<App foo={function() {',
@@ -546,8 +490,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider store>',
@@ -555,8 +498,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t\tfoo />',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'after-props'}]
   }, {
     code: [
       '<Provider ',
@@ -566,8 +508,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t\tfoo />',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'after-props'}]
   }, {
     code: [
       '<Provider ',
@@ -577,8 +518,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>',
       '</Provider>'
     ].join('\n'),
-    options: [{nonEmpty: 'after-props'}],
-    parserOptions: parserOptions
+    options: [{nonEmpty: 'after-props'}]
   }, {
     code: [
       '<Provider store>',
@@ -587,8 +527,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t\t/>',
       '</Provider>'
     ].join('\n'),
-    options: [{selfClosing: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{selfClosing: 'props-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -599,8 +538,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>',
       '</Provider>'
     ].join('\n'),
-    options: [{nonEmpty: 'props-aligned'}],
-    parserOptions: parserOptions
+    options: [{nonEmpty: 'props-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -611,8 +549,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t       </App>',
       '}'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -621,16 +558,14 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t       />',
       '}'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = <App',
       '\tfoo',
       '        />'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }, {
     code: [
       'var x = function() {',
@@ -641,8 +576,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>',
       '}'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       'var x = <App',
@@ -651,8 +585,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t}}',
       '/>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -665,8 +598,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>',
       '</Provider>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<Provider',
@@ -679,8 +611,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>}',
       '</Provider>'
     ].join('\n'),
-    options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'line-aligned'}]
   }, {
     code: [
       '<App>',
@@ -695,8 +626,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     options: [{
       nonEmpty: false,
       selfClosing: 'after-props'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App>',
@@ -711,8 +641,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     options: [{
       nonEmpty: 'after-props',
       selfClosing: false
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<div className={[',
@@ -723,8 +652,7 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\tSome text',
       '</div>'
     ].join('\n'),
-    options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions
+    options: [{location: 'tag-aligned'}]
   }],
 
   invalid: [{
@@ -735,7 +663,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     output: [
       '<App />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_TAG
   }, {
     code: [
@@ -745,7 +672,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     output: [
       '<App foo/>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -755,7 +681,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
     output: [
       '<App foo></App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -768,7 +693,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 3, true),
       line: 2,
@@ -785,7 +709,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -802,7 +725,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, true),
       line: 2,
@@ -819,7 +741,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  foo/>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -833,7 +754,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  />'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 3, false),
       line: 3,
@@ -850,7 +770,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  foo/>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -864,7 +783,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, false),
       line: 3,
@@ -882,7 +800,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -899,7 +816,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  foo></App>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -913,7 +829,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  ></App>'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 3, false),
       line: 3,
@@ -930,7 +845,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '  foo></App>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -944,7 +858,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '></App>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, false),
       line: 3,
@@ -962,7 +875,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '></App>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -987,7 +899,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{selfClosing: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -1019,7 +930,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['props-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 7, false),
       line: 6,
@@ -1051,7 +961,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['tag-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 5, false),
       line: 6,
@@ -1083,7 +992,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['line-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 5, false),
       line: 6,
@@ -1109,7 +1017,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{nonEmpty: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 3, false),
       line: 6,
@@ -1132,7 +1039,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -1156,7 +1062,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{nonEmpty: 'after-props'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 3, false),
       line: 5,
@@ -1178,7 +1083,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 3, false),
       line: 4,
@@ -1196,7 +1100,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -1219,7 +1122,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 3, true),
       line: 4,
@@ -1240,7 +1142,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 3, true),
       line: 3,
@@ -1259,7 +1160,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [MESSAGE_AFTER_TAG]
   }, {
     code: [
@@ -1280,7 +1180,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</div>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 4,
@@ -1297,7 +1196,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 2, true),
       line: 2,
@@ -1314,7 +1212,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -1331,7 +1228,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, true),
       line: 2,
@@ -1348,7 +1244,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\tfoo/>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -1362,7 +1257,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t/>'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 2, false),
       line: 3,
@@ -1379,7 +1273,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\tfoo/>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -1393,7 +1286,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, false),
       line: 3,
@@ -1411,7 +1303,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -1428,7 +1319,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\tfoo></App>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -1442,7 +1332,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\t></App>'
     ].join('\n'),
     options: [{location: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 2, false),
       line: 3,
@@ -1459,7 +1348,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '\tfoo></App>'
     ].join('\n'),
     options: [{location: 'after-props'}],
-    parserOptions: parserOptions,
     errors: MESSAGE_AFTER_PROPS
   }, {
     code: [
@@ -1473,7 +1361,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '></App>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, false),
       line: 3,
@@ -1491,7 +1378,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '></App>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -1516,7 +1402,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{selfClosing: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -1548,7 +1433,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['props-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_PROPS_ALIGNED, 4, false),
       line: 6,
@@ -1580,7 +1464,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['tag-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 3, false),
       line: 6,
@@ -1612,7 +1495,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '};'
     ].join('\n'),
     options: ['line-aligned'],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 3, false),
       line: 6,
@@ -1638,7 +1520,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{nonEmpty: 'props-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 2, false),
       line: 6,
@@ -1661,7 +1542,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{selfClosing: 'after-props'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 2,
@@ -1685,7 +1565,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</Provider>'
     ].join('\n'),
     options: [{nonEmpty: 'after-props'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 2, false),
       line: 5,
@@ -1707,7 +1586,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '}'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 2, false),
       line: 4,
@@ -1725,7 +1603,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '/>'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 1, false),
       line: 3,
@@ -1748,7 +1625,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 2, true),
       line: 4,
@@ -1769,7 +1645,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_LINE_ALIGNED, 2, true),
       line: 3,
@@ -1788,7 +1663,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       ')'
     ].join('\n'),
     options: [{location: 'line-aligned'}],
-    parserOptions: parserOptions,
     errors: [MESSAGE_AFTER_TAG]
   }, {
     code: [
@@ -1809,7 +1683,6 @@ ruleTester.run('jsx-closing-bracket-location', rule, {
       '</div>'
     ].join('\n'),
     options: [{location: 'tag-aligned'}],
-    parserOptions: parserOptions,
     errors: [{
       message: messageWithDetails(MESSAGE_TAG_ALIGNED, 1, true),
       line: 4,
diff --git a/tests/lib/rules/jsx-curly-spacing.js b/tests/lib/rules/jsx-curly-spacing.js
index 078ea2cf17..9f59c7b182 100644
--- a/tests/lib/rules/jsx-curly-spacing.js
+++ b/tests/lib/rules/jsx-curly-spacing.js
@@ -11,10 +11,11 @@
 
 var rule = require('../../../lib/rules/jsx-curly-spacing');
 var RuleTester = require('eslint').RuleTester;
-
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -23,155 +24,126 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-curly-spacing', rule, {
   valid: [{
-    code: '<App foo={bar} />;',
-    parserOptions: parserOptions
+    code: '<App foo={bar} />;'
   }, {
     code: '<App foo={bar} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={ bar } />;',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo={ bar } />;',
-    options: ['always', {allowMultiline: false}],
-    parserOptions: parserOptions
+    options: ['always', {allowMultiline: false}]
   }, {
     code: '<App foo={{ bar:baz }} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={ {bar:baz} } />;',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App foo={',
       'bar',
       '} />;'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App foo={',
       'bar',
       '} />;'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App foo={',
       'bar',
       '} />;'
     ].join('\n'),
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: [
       '<div>{/* comment */}</div>;'
     ].join('\n'),
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={bar/* comment */} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={ bar } />;',
-    options: ['always', {spacing: {}}],
-    parserOptions: parserOptions
+    options: ['always', {spacing: {}}]
   }, {
     code: [
       '<App foo={',
       'bar',
       '} />;'
     ].join('\n'),
-    options: ['always', {spacing: {}}],
-    parserOptions: parserOptions
+    options: ['always', {spacing: {}}]
   }, {
     code: '<App foo={{ bar: true, baz: true }} />;',
-    options: ['always', {spacing: {objectLiterals: 'never'}}],
-    parserOptions: parserOptions
+    options: ['always', {spacing: {objectLiterals: 'never'}}]
   }, {
     code: [
       '<App foo={',
       'bar',
       '} />;'
     ].join('\n'),
-    options: ['always', {allowMultiline: true}],
-    parserOptions: parserOptions
+    options: ['always', {allowMultiline: true}]
   }, {
-    code: '<App {...bar} />;',
-    parserOptions: parserOptions
+    code: '<App {...bar} />;'
   }, {
     code: '<App {...bar} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App { ...bar } />;',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App { ...bar } />;',
-    options: ['always', {allowMultiline: false}],
-    parserOptions: parserOptions
+    options: ['always', {allowMultiline: false}]
   }, {
     code: [
       '<App {',
       '...bar',
       '} />;'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App {',
       '...bar',
       '} />;'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App {',
       '...bar',
       '} />;'
     ].join('\n'),
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App {...bar/* comment */} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
-    code: '<App foo={bar} {...baz} />;',
-    parserOptions: parserOptions
+    code: '<App foo={bar} {...baz} />;'
   }, {
     code: '<App foo={bar} {...baz} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={ bar } { ...baz } />;',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo={ bar } { ...baz } />;',
-    options: ['always', {allowMultiline: false}],
-    parserOptions: parserOptions
+    options: ['always', {allowMultiline: false}]
   }, {
     code: '<App foo={{ bar:baz }} {...baz} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={ {bar:baz} } { ...baz } />;',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: [
       '<App foo={',
@@ -180,20 +152,16 @@ ruleTester.run('jsx-curly-spacing', rule, {
       '...bar',
       '}/>;'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo={bar/* comment */} {...baz/* comment */} />;',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={3} bar={ {a: 2} } />',
-    options: ['never', {spacing: {objectLiterals: 'always'}}],
-    parserOptions: parserOptions
+    options: ['never', {spacing: {objectLiterals: 'always'}}]
   }, {
     code: '<div foo={ bar }>{bar}</div>',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }],
 
   invalid: [{
@@ -204,8 +172,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar } />;',
     output: '<App foo={bar} />;',
@@ -214,8 +181,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar} />;',
     output: '<App foo={ bar } />;',
@@ -224,8 +190,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar} />;',
     output: '<App foo={ bar } />;',
@@ -234,40 +199,35 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar} />;',
     output: '<App foo={ bar } />;',
     options: ['always'],
     errors: [{
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar } />;',
     output: '<App foo={ bar } />;',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar} />;',
     output: '<App foo={bar} />;',
     options: ['never'],
     errors: [{
       message: 'There should be no space after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar } />;',
     output: '<App foo={bar} />;',
     options: ['never'],
     errors: [{
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App foo={',
@@ -280,8 +240,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App foo={',
@@ -294,8 +253,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar} />;',
     output: '<App foo={ bar } />;',
@@ -304,24 +262,21 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar} />;',
     output: '<App foo={ bar } />;',
     options: ['always', {spacing: {}}],
     errors: [{
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar } />;',
     output: '<App foo={ bar } />;',
     options: ['always', {spacing: {}}],
     errors: [{
       message: 'A space is required after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ {bar: true, baz: true} } />;',
     output: '<App foo={{bar: true, baz: true}} />;',
@@ -330,8 +285,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App { ...bar } />;',
     output: '<App {...bar} />;',
@@ -340,8 +294,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App { ...bar } />;',
     output: '<App {...bar} />;',
@@ -350,8 +303,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App {...bar} />;',
     output: '<App { ...bar } />;',
@@ -360,8 +312,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App {...bar} />;',
     output: '<App { ...bar } />;',
@@ -370,40 +321,35 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App { ...bar} />;',
     output: '<App { ...bar } />;',
     options: ['always'],
     errors: [{
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App {...bar } />;',
     output: '<App { ...bar } />;',
     options: ['always'],
     errors: [{
       message: 'A space is required after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App { ...bar} />;',
     output: '<App {...bar} />;',
     options: ['never'],
     errors: [{
       message: 'There should be no space after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App {...bar } />;',
     output: '<App {...bar} />;',
     options: ['never'],
     errors: [{
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App {',
@@ -416,8 +362,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App {',
@@ -430,8 +375,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar } { ...baz } />;',
     output: '<App foo={bar} {...baz} />;',
@@ -444,8 +388,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar } { ...baz } />;',
     output: '<App foo={bar} {...baz} />;',
@@ -458,8 +401,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar} {...baz} />;',
     output: '<App foo={ bar } { ...baz } />;',
@@ -472,8 +414,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar} {...baz} />;',
     output: '<App foo={ bar } { ...baz } />;',
@@ -486,8 +427,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar} { ...baz} />;',
     output: '<App foo={ bar } { ...baz } />;',
@@ -496,8 +436,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required before \'}\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar } {...baz } />;',
     output: '<App foo={ bar } { ...baz } />;',
@@ -506,8 +445,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ bar} { ...baz} />;',
     output: '<App foo={bar} {...baz} />;',
@@ -516,8 +454,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space after \'{\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={bar } {...baz } />;',
     output: '<App foo={bar} {...baz} />;',
@@ -526,8 +463,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space before \'}\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App foo={',
@@ -546,8 +482,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<App foo={',
@@ -566,8 +501,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no newline after \'{\''
     }, {
       message: 'There should be no newline before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<App foo={ 3 } bar={{a: 2}} />',
     output: '<App foo={3} bar={ {a: 2} } />',
@@ -580,8 +514,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<div foo={ foo /* comment */ } />',
     output: '<div foo={foo /* comment */} />',
@@ -589,8 +522,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<div foo={foo /* comment */} />',
     output: '<div foo={ foo /* comment */ } />',
@@ -599,8 +531,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<div foo={ /* comment */ foo } />',
     output: '<div foo={/* comment */ foo} />',
@@ -608,8 +539,7 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'There should be no space after \'{\''
     }, {
       message: 'There should be no space before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '<div foo={/* comment */ foo} />',
     output: '<div foo={ /* comment */ foo } />',
@@ -618,7 +548,6 @@ ruleTester.run('jsx-curly-spacing', rule, {
       message: 'A space is required after \'{\''
     }, {
       message: 'A space is required before \'}\''
-    }],
-    parserOptions: parserOptions
+    }]
   }]
 });
diff --git a/tests/lib/rules/jsx-equals-spacing.js b/tests/lib/rules/jsx-equals-spacing.js
index 2e02ab67f1..a5edb4b518 100644
--- a/tests/lib/rules/jsx-equals-spacing.js
+++ b/tests/lib/rules/jsx-equals-spacing.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-equals-spacing');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,69 +24,53 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-equals-spacing', rule, {
   valid: [{
-    code: '<App />',
-    parserOptions: parserOptions
+    code: '<App />'
   }, {
-    code: '<App foo />',
-    parserOptions: parserOptions
+    code: '<App foo />'
   }, {
-    code: '<App foo="bar" />',
-    parserOptions: parserOptions
+    code: '<App foo="bar" />'
   }, {
-    code: '<App foo={e => bar(e)} />',
-    parserOptions: parserOptions
+    code: '<App foo={e => bar(e)} />'
   }, {
-    code: '<App {...props} />',
-    parserOptions: parserOptions
+    code: '<App {...props} />'
   }, {
     code: '<App />',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo />',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo="bar" />',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={e => bar(e)} />',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App {...props} />',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App />',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo />',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo = "bar" />',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App foo = {e => bar(e)} />',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }, {
     code: '<App {...props} />',
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }],
 
   invalid: [{
     code: '<App foo = {bar} />',
     output: '<App foo={bar} />',
-    parserOptions: parserOptions,
     errors: [
       {message: 'There should be no space before \'=\''},
       {message: 'There should be no space after \'=\''}
@@ -93,7 +79,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo = {bar} />',
     output: '<App foo={bar} />',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'There should be no space before \'=\''},
       {message: 'There should be no space after \'=\''}
@@ -102,7 +87,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo ={bar} />',
     output: '<App foo={bar} />',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'There should be no space before \'=\''}
     ]
@@ -110,7 +94,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo= {bar} />',
     output: '<App foo={bar} />',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'There should be no space after \'=\''}
     ]
@@ -118,7 +101,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo= {bar} bar = {baz} />',
     output: '<App foo={bar} bar={baz} />',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'There should be no space after \'=\''},
       {message: 'There should be no space before \'=\''},
@@ -128,7 +110,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo={bar} />',
     output: '<App foo = {bar} />',
     options: ['always'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before \'=\''},
       {message: 'A space is required after \'=\''}
@@ -137,7 +118,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo ={bar} />',
     output: '<App foo = {bar} />',
     options: ['always'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required after \'=\''}
     ]
@@ -145,7 +125,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo= {bar} />',
     output: '<App foo = {bar} />',
     options: ['always'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before \'=\''}
     ]
@@ -153,7 +132,6 @@ ruleTester.run('jsx-equals-spacing', rule, {
     code: '<App foo={bar} bar ={baz} />',
     output: '<App foo = {bar} bar = {baz} />',
     options: ['always'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before \'=\''},
       {message: 'A space is required after \'=\''},
diff --git a/tests/lib/rules/jsx-filename-extension.js b/tests/lib/rules/jsx-filename-extension.js
index 0efa99c0eb..5db5a69fee 100644
--- a/tests/lib/rules/jsx-filename-extension.js
+++ b/tests/lib/rules/jsx-filename-extension.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-filename-extension');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -29,24 +31,21 @@ var withoutJSX = 'module.exports = {}';
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-filename-extension', rule, {
 
   valid: [
     {
       filename: '<text>',
-      code: withJSX,
-      parserOptions: parserOptions
+      code: withJSX
     },
     {
       filename: 'MyComponent.jsx',
-      code: withJSX,
-      parserOptions: parserOptions
+      code: withJSX
     }, {
       filename: 'MyComponent.js',
       options: [{extensions: ['.js', '.jsx']}],
-      code: withJSX,
-      parserOptions: parserOptions
+      code: withJSX
     }, {
       filename: 'notAComponent.js',
       code: withoutJSX
@@ -57,12 +56,10 @@ ruleTester.run('jsx-filename-extension', rule, {
     {
       filename: 'MyComponent.js',
       code: withJSX,
-      parserOptions: parserOptions,
       errors: [{message: 'JSX not allowed in files with extension \'.js\''}]
     }, {
       filename: 'MyComponent.jsx',
       code: withJSX,
-      parserOptions: parserOptions,
       options: [{extensions: ['.js']}],
       errors: [{message: 'JSX not allowed in files with extension \'.jsx\''}]
     }
diff --git a/tests/lib/rules/jsx-first-prop-new-line.js b/tests/lib/rules/jsx-first-prop-new-line.js
index a7b558ce30..c40fccbbe9 100644
--- a/tests/lib/rules/jsx-first-prop-new-line.js
+++ b/tests/lib/rules/jsx-first-prop-new-line.js
@@ -11,35 +11,42 @@
 var rule = require('../../../lib/rules/jsx-first-prop-new-line');
 var RuleTester = require('eslint').RuleTester;
 
-var parserOptions = 'babel-eslint';
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
 
 // -----------------------------------------------------------------------------
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-first-prop-new-line', rule, {
 
   valid: [
     {
       code: '<Foo />',
       options: ['never'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo prop="bar" />',
       options: ['never'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo {...this.props} />',
       options: ['never'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo a a a />',
       options: ['never'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -48,27 +55,27 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['never'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo />',
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo prop="one" />',
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo {...this.props} />',
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo a a a />',
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -78,7 +85,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -88,21 +95,21 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['multiline'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
         '<Foo bar />'
       ].join('\n'),
       options: ['multiline-multiprop'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
         '<Foo bar baz />'
       ].join('\n'),
       options: ['multiline-multiprop'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -110,7 +117,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '}} />'
       ].join('\n'),
       options: ['multiline-multiprop'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -121,12 +128,12 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['multiline-multiprop'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: '<Foo />',
       options: ['always'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -136,7 +143,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['always'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -146,7 +153,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
         '/>'
       ].join('\n'),
       options: ['always'],
-      parser: parserOptions
+      parser: 'babel-eslint'
     }
   ],
 
@@ -159,7 +166,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
       ].join('\n'),
       options: ['always'],
       errors: [{message: 'Property should be placed on a new line'}],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -175,7 +182,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
       ].join('\n'),
       options: ['always'],
       errors: [{message: 'Property should be placed on a new line'}],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -191,7 +198,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
       ].join('\n'),
       options: ['never'],
       errors: [{message: 'Property should be placed on the same line as the component declaration'}],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -205,7 +212,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
       ].join('\n'),
       options: ['multiline'],
       errors: [{message: 'Property should be placed on a new line'}],
-      parser: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -219,7 +226,7 @@ ruleTester.run('jsx-first-prop-new-line', rule, {
       ].join('\n'),
       options: ['multiline-multiprop'],
       errors: [{message: 'Property should be placed on a new line'}],
-      parser: parserOptions
+      parser: 'babel-eslint'
     }
   ]
 });
diff --git a/tests/lib/rules/jsx-handler-names.js b/tests/lib/rules/jsx-handler-names.js
index 8d8dbf1c3a..ee61f91f34 100644
--- a/tests/lib/rules/jsx-handler-names.js
+++ b/tests/lib/rules/jsx-handler-names.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-handler-names');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,53 +24,44 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-handler-names', rule, {
   valid: [{
     code: [
       '<TestComponent onChange={this.handleChange} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent onChange={this.props.onChange} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent onChange={this.props.onFoo} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent isSelected={this.props.isSelected} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent shouldDisplay={this.state.shouldDisplay} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent shouldDisplay={arr[0].prop} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent onChange={props.onChange} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent ref={this.handleRef} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent ref={this.somethingRef} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<TestComponent test={this.props.content} />'
@@ -76,8 +69,7 @@ ruleTester.run('jsx-handler-names', rule, {
     options: [{
       eventHandlerPrefix: 'on',
       eventHandlerPropPrefix: 'on'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '<TestComponent onChange={props::handleChange} />'
@@ -96,39 +88,33 @@ ruleTester.run('jsx-handler-names', rule, {
   }, {
     code: [
       '<TestComponent only={this.only} />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
     code: [
       '<TestComponent onChange={this.doSomethingOnChange} />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Handler function for onChange prop key must begin with \'handle\''}]
   }, {
     code: [
       '<TestComponent onChange={this.handlerChange} />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Handler function for onChange prop key must begin with \'handle\''}]
   }, {
     code: [
       '<TestComponent only={this.handleChange} />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Prop key for handleChange must begin with \'on\''}]
   }, {
     code: [
       '<TestComponent handleChange={this.handleChange} />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Prop key for handleChange must begin with \'on\''}]
   }, {
     code: [
       '<TestComponent onChange={this.onChange} />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Handler function for onChange prop key must begin with \'handle\''}]
   }, {
     code: [
diff --git a/tests/lib/rules/jsx-indent-props.js b/tests/lib/rules/jsx-indent-props.js
index 8748a9599e..834a67b197 100644
--- a/tests/lib/rules/jsx-indent-props.js
+++ b/tests/lib/rules/jsx-indent-props.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-indent-props');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,46 +24,41 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-indent-props', rule, {
   valid: [{
     code: [
       '<App foo',
       '/>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App',
       '  foo',
       '/>'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       '<App',
       'foo',
       '/>'
     ].join('\n'),
-    options: [0],
-    parserOptions: parserOptions
+    options: [0]
   }, {
     code: [
       '  <App',
       'foo',
       '  />'
     ].join('\n'),
-    options: [-2],
-    parserOptions: parserOptions
+    options: [-2]
   }, {
     code: [
       '<App',
       '\tfoo',
       '/>'
     ].join('\n'),
-    options: ['tab'],
-    parserOptions: parserOptions
+    options: ['tab']
   }],
 
   invalid: [{
@@ -75,7 +72,6 @@ ruleTester.run('jsx-indent-props', rule, {
       '    foo',
       '/>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 4 space characters but found 2.'}]
   }, {
     code: [
@@ -89,7 +85,6 @@ ruleTester.run('jsx-indent-props', rule, {
       '/>'
     ].join('\n'),
     options: [2],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 2 space characters but found 4.'}]
   }, {
     code: [
@@ -103,7 +98,6 @@ ruleTester.run('jsx-indent-props', rule, {
       '/>'
     ].join('\n'),
     options: ['tab'],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 1 tab character but found 0.'}]
   }, {
     code: [
@@ -117,7 +111,6 @@ ruleTester.run('jsx-indent-props', rule, {
       '/>'
     ].join('\n'),
     options: ['tab'],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 1 tab character but found 3.'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-indent.js b/tests/lib/rules/jsx-indent.js
index 4d1789eccf..be011a711b 100644
--- a/tests/lib/rules/jsx-indent.js
+++ b/tests/lib/rules/jsx-indent.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-indent');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,51 +24,45 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-indent', rule, {
   valid: [{
     code: [
       '<App></App>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App>',
       '</App>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App>',
       '  <Foo />',
       '</App>'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       '<App>',
       '<Foo />',
       '</App>'
     ].join('\n'),
-    options: [0],
-    parserOptions: parserOptions
+    options: [0]
   }, {
     code: [
       '  <App>',
       '<Foo />',
       '  </App>'
     ].join('\n'),
-    options: [-2],
-    parserOptions: parserOptions
+    options: [-2]
   }, {
     code: [
       '<App>',
       '\t<Foo />',
       '</App>'
     ].join('\n'),
-    options: ['tab'],
-    parserOptions: parserOptions
+    options: ['tab']
   }, {
     code: [
       'function App() {',
@@ -75,8 +71,7 @@ ruleTester.run('jsx-indent', rule, {
       '  </App>;',
       '}'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       'function App() {',
@@ -85,8 +80,7 @@ ruleTester.run('jsx-indent', rule, {
       '  </App>);',
       '}'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       'function App() {',
@@ -97,8 +91,7 @@ ruleTester.run('jsx-indent', rule, {
       '  );',
       '}'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       'it(',
@@ -109,7 +102,6 @@ ruleTester.run('jsx-indent', rule, {
       '  )',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -121,7 +113,6 @@ ruleTester.run('jsx-indent', rule, {
       '  </div>)',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -131,7 +122,6 @@ ruleTester.run('jsx-indent', rule, {
       '  </div>',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -142,7 +132,6 @@ ruleTester.run('jsx-indent', rule, {
       '  </h1>',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -153,7 +142,6 @@ ruleTester.run('jsx-indent', rule, {
       '    </h1>',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -164,7 +152,6 @@ ruleTester.run('jsx-indent', rule, {
       '  </h1>)',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -176,7 +163,6 @@ ruleTester.run('jsx-indent', rule, {
       '  )',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -185,7 +171,6 @@ ruleTester.run('jsx-indent', rule, {
       '  <div />',
       ']'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2]
   }, {
     code: [
@@ -197,8 +182,7 @@ ruleTester.run('jsx-indent', rule, {
       '        ]',
       '    }',
       '</div>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<div>',
@@ -209,8 +193,7 @@ ruleTester.run('jsx-indent', rule, {
       '        ]',
       '    }',
       '</div>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Literals indentation is not touched
     code: [
@@ -220,8 +203,7 @@ ruleTester.run('jsx-indent', rule, {
       '   bar {foo}',
       'bar </div>',
       '</div>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the end of the first expression)
@@ -229,8 +211,7 @@ ruleTester.run('jsx-indent', rule, {
       'foo ?',
       '    <Foo /> :',
       '    <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the start of the second expression)
@@ -238,8 +219,7 @@ ruleTester.run('jsx-indent', rule, {
       'foo ?',
       '    <Foo />',
       '    : <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon on its own line)
@@ -248,8 +228,7 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo />',
       ':',
       '    <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (multiline JSX, colon on its own line)
@@ -263,24 +242,21 @@ ruleTester.run('jsx-indent', rule, {
       '        onClick={this.onClick}',
       '    />',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon at the end of the first expression)
     code: [
       'foo ? <Foo /> :',
       '<Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon at the start of the second expression)
     code: [
       'foo ? <Foo />',
       ': <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon on its own line)
@@ -288,8 +264,7 @@ ruleTester.run('jsx-indent', rule, {
       'foo ? <Foo />',
       ':',
       '<Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the end of the first expression, parenthesized first expression)
@@ -298,8 +273,7 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo />',
       ') :',
       '    <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the start of the second expression, parenthesized first expression)
@@ -308,8 +282,7 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo />',
       ')',
       '    : <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon on its own line, parenthesized first expression)
@@ -319,8 +292,7 @@ ruleTester.run('jsx-indent', rule, {
       ')',
       ':',
       '    <Bar />'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the end of the first expression, parenthesized second expression)
@@ -329,8 +301,7 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo /> : (',
       '        <Bar />',
       '    )'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon on its own line, parenthesized second expression)
@@ -340,8 +311,7 @@ ruleTester.run('jsx-indent', rule, {
       ': (',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon indented on its own line, parenthesized second expression)
@@ -351,8 +321,7 @@ ruleTester.run('jsx-indent', rule, {
       '    : (',
       '        <Bar />',
       '    )'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon at the end of the first expression, both expression parenthesized)
@@ -362,8 +331,7 @@ ruleTester.run('jsx-indent', rule, {
       ') : (',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon on its own line, both expression parenthesized)
@@ -374,8 +342,7 @@ ruleTester.run('jsx-indent', rule, {
       ': (',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (colon on its own line, both expression parenthesized)
@@ -387,8 +354,7 @@ ruleTester.run('jsx-indent', rule, {
       '(',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon at the end of the first expression, parenthesized second expression)
@@ -396,16 +362,14 @@ ruleTester.run('jsx-indent', rule, {
       'foo ? <Foo /> : (',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon at the start of the second expression, parenthesized second expression)
     code: [
       'foo ? <Foo />',
       ': (<Bar />)'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Multiline ternary
     // (first expression on test line, colon on its own line, parenthesized second expression)
@@ -414,8 +378,7 @@ ruleTester.run('jsx-indent', rule, {
       ': (',
       '    <Bar />',
       ')'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<span>',
@@ -427,8 +390,7 @@ ruleTester.run('jsx-indent', rule, {
       '  }',
       '</span>'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       '<span>',
@@ -440,8 +402,7 @@ ruleTester.run('jsx-indent', rule, {
       '  }',
       '</span>'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }, {
     code: [
       'function foo() {',
@@ -455,8 +416,7 @@ ruleTester.run('jsx-indent', rule, {
       '  </span>',
       '}'
     ].join('\n'),
-    options: [2],
-    parserOptions: parserOptions
+    options: [2]
   }],
 
   invalid: [{
@@ -470,7 +430,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo />',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 4 space characters but found 2.'}]
   }, {
     code: [
@@ -484,7 +443,6 @@ ruleTester.run('jsx-indent', rule, {
       '</App>'
     ].join('\n'),
     options: [2],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 2 space characters but found 4.'}]
   }, {
     code: [
@@ -498,7 +456,6 @@ ruleTester.run('jsx-indent', rule, {
       '</App>'
     ].join('\n'),
     options: ['tab'],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 1 tab character but found 0.'}]
   }, {
     code: [
@@ -516,7 +473,6 @@ ruleTester.run('jsx-indent', rule, {
       '}'
     ].join('\n'),
     options: [2],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 2 space characters but found 9.'}]
   }, {
     code: [
@@ -534,7 +490,6 @@ ruleTester.run('jsx-indent', rule, {
       '}'
     ].join('\n'),
     options: [2],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 2 space characters but found 4.'}]
   }, {
     code: [
@@ -560,7 +515,6 @@ ruleTester.run('jsx-indent', rule, {
       '}'
     ].join('\n'), */
     options: [2],
-    parserOptions: parserOptions,
     errors: [{message: 'Expected indentation of 4 space characters but found 0.'}]
   }, {
     code: [
@@ -573,7 +527,6 @@ ruleTester.run('jsx-indent', rule, {
       '    {test}',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 3.'}
     ]
@@ -596,7 +549,6 @@ ruleTester.run('jsx-indent', rule, {
       '    ))}',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 12 space characters but found 11.'}
     ]
@@ -611,7 +563,6 @@ ruleTester.run('jsx-indent', rule, {
       '\t{test}',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['tab'],
     errors: [
       {message: 'Expected indentation of 1 tab character but found 0.'}
@@ -635,7 +586,6 @@ ruleTester.run('jsx-indent', rule, {
       '\t))}',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['tab'],
     errors: [
       {message: 'Expected indentation of 3 tab characters but found 2.'}
@@ -651,7 +601,6 @@ ruleTester.run('jsx-indent', rule, {
       '\t<Foo />\n',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['tab'],
     errors: [
       {message: 'Expected indentation of 1 tab character but found 0.'}
@@ -669,7 +618,6 @@ ruleTester.run('jsx-indent', rule, {
       '  <div />',
       ']'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2],
     errors: [
       {message: 'Expected indentation of 2 space characters but found 4.'}
@@ -685,7 +633,6 @@ ruleTester.run('jsx-indent', rule, {
       '\t<Foo />\n',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['tab'],
     errors: [
       {message: 'Expected indentation of 1 tab character but found 0.'}
@@ -701,7 +648,6 @@ ruleTester.run('jsx-indent', rule, {
       '  <Foo />\n',
       '</App>'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: [2],
     errors: [
       {message: 'Expected indentation of 2 space characters but found 0.'}
@@ -727,7 +673,6 @@ ruleTester.run('jsx-indent', rule, {
       '    }',
       '</div>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 12 space characters but found 8.'}
     ]
@@ -752,7 +697,6 @@ ruleTester.run('jsx-indent', rule, {
       '    }',
       '</div>'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 12 space characters but found 8.'}
     ]
@@ -769,7 +713,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Foo /> :',
       '    <Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -788,7 +731,6 @@ ruleTester.run('jsx-indent', rule, {
       ':',
       '    <Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -803,7 +745,6 @@ ruleTester.run('jsx-indent', rule, {
       'foo ? <Foo /> :',
       '<Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 0 space characters but found 4.'}
     ]
@@ -820,7 +761,6 @@ ruleTester.run('jsx-indent', rule, {
       ':',
       '<Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 0 space characters but found 6.'}
     ]
@@ -839,7 +779,6 @@ ruleTester.run('jsx-indent', rule, {
       ') :',
       '    <Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -860,7 +799,6 @@ ruleTester.run('jsx-indent', rule, {
       ':',
       '    <Bar />'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -879,7 +817,6 @@ ruleTester.run('jsx-indent', rule, {
       '        <Bar />',
       '    )'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 8 space characters but found 4.'}
     ]
@@ -900,7 +837,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -921,7 +857,6 @@ ruleTester.run('jsx-indent', rule, {
       '        <Bar />',
       '    )'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 8 space characters but found 4.'}
     ]
@@ -942,7 +877,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'},
       {message: 'Expected indentation of 4 space characters but found 0.'}
@@ -966,7 +900,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'},
       {message: 'Expected indentation of 4 space characters but found 0.'}
@@ -992,7 +925,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'},
       {message: 'Expected indentation of 4 space characters but found 0.'}
@@ -1010,7 +942,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
@@ -1029,7 +960,6 @@ ruleTester.run('jsx-indent', rule, {
       '    <Bar />',
       ')'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [
       {message: 'Expected indentation of 4 space characters but found 0.'}
     ]
diff --git a/tests/lib/rules/jsx-key.js b/tests/lib/rules/jsx-key.js
index 7cb8ad41b1..df2a373f95 100644
--- a/tests/lib/rules/jsx-key.js
+++ b/tests/lib/rules/jsx-key.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-key');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,44 +24,38 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-key', rule, {
   valid: [
-    {code: 'fn()', parserOptions: parserOptions},
-    {code: '[1, 2, 3].map(function () {})', parserOptions: parserOptions},
-    {code: '<App />;', parserOptions: parserOptions},
-    {code: '[<App key={0} />, <App key={1} />];', parserOptions: parserOptions},
-    {code: '[1, 2, 3].map(function(x) { return <App key={x} /> });', parserOptions: parserOptions},
-    {code: '[1, 2, 3].map(x => <App key={x} />);', parserOptions: parserOptions},
-    {code: '[1, 2, 3].map(x => { return <App key={x} /> });', parserOptions: parserOptions},
-    {code: '[1, 2, 3].foo(x => <App />);', parserOptions: parserOptions},
-    {code: 'var App = () => <div />;', parserOptions: parserOptions},
-    {code: '[1, 2, 3].map(function(x) { return; });', parserOptions: parserOptions},
-    {code: 'foo(() => <div />);', parserOptions: parserOptions}
+    {code: 'fn()'},
+    {code: '[1, 2, 3].map(function () {})'},
+    {code: '<App />;'},
+    {code: '[<App key={0} />, <App key={1} />];'},
+    {code: '[1, 2, 3].map(function(x) { return <App key={x} /> });'},
+    {code: '[1, 2, 3].map(x => <App key={x} />);'},
+    {code: '[1, 2, 3].map(x => { return <App key={x} /> });'},
+    {code: '[1, 2, 3].foo(x => <App />);'},
+    {code: 'var App = () => <div />;'},
+    {code: '[1, 2, 3].map(function(x) { return; });'},
+    {code: 'foo(() => <div />);'}
   ],
   invalid: [{
     code: '[<App />];',
-    errors: [{message: 'Missing "key" prop for element in array'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in array'}]
   }, {
     code: '[<App {...key} />];',
-    errors: [{message: 'Missing "key" prop for element in array'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in array'}]
   }, {
     code: '[<App key={0}/>, <App />];',
-    errors: [{message: 'Missing "key" prop for element in array'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in array'}]
   }, {
     code: '[1, 2 ,3].map(function(x) { return <App /> });',
-    errors: [{message: 'Missing "key" prop for element in iterator'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in iterator'}]
   }, {
     code: '[1, 2 ,3].map(x => <App />);',
-    errors: [{message: 'Missing "key" prop for element in iterator'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in iterator'}]
   }, {
     code: '[1, 2 ,3].map(x => { return <App /> });',
-    errors: [{message: 'Missing "key" prop for element in iterator'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Missing "key" prop for element in iterator'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-max-props-per-line.js b/tests/lib/rules/jsx-max-props-per-line.js
index 55ce2d2e79..00ea0d42aa 100644
--- a/tests/lib/rules/jsx-max-props-per-line.js
+++ b/tests/lib/rules/jsx-max-props-per-line.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-max-props-per-line');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,42 +24,34 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-max-props-per-line', rule, {
   valid: [{
-    code: '<App />',
-    parserOptions: parserOptions
+    code: '<App />'
   }, {
-    code: '<App foo />',
-    parserOptions: parserOptions
+    code: '<App foo />'
   }, {
     code: '<App foo bar />',
-    options: [{maximum: 2}],
-    parserOptions: parserOptions
+    options: [{maximum: 2}]
   }, {
     code: '<App foo bar />',
-    options: [{when: 'multiline'}],
-    parserOptions: parserOptions
+    options: [{when: 'multiline'}]
   }, {
     code: '<App foo {...this.props} />',
-    options: [{when: 'multiline'}],
-    parserOptions: parserOptions
+    options: [{when: 'multiline'}]
   }, {
     code: '<App foo bar baz />',
-    options: [{maximum: 2, when: 'multiline'}],
-    parserOptions: parserOptions
+    options: [{maximum: 2, when: 'multiline'}]
   }, {
     code: '<App {...this.props} bar />',
-    options: [{maximum: 2}],
-    parserOptions: parserOptions
+    options: [{maximum: 2}]
   }, {
     code: [
       '<App',
       '  foo',
       '  bar',
       '/>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '<App',
@@ -65,27 +59,22 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '  baz',
       '/>'
     ].join('\n'),
-    options: [{maximum: 2}],
-    parserOptions: parserOptions
+    options: [{maximum: 2}]
   }],
 
   invalid: [{
     code: '<App foo bar baz />;',
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: '<App foo bar baz />;',
     options: [{maximum: 2}],
-    errors: [{message: 'Prop `baz` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `baz` must be placed on a new line'}]
   }, {
     code: '<App {...this.props} bar />;',
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: '<App bar {...this.props} />;',
-    errors: [{message: 'Prop `this.props` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `this.props` must be placed on a new line'}]
   }, {
     code: [
       '<App',
@@ -93,8 +82,7 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '  baz',
       '/>'
     ].join('\n'),
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: [
       '<App',
@@ -102,8 +90,7 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '  baz',
       '/>'
     ].join('\n'),
-    errors: [{message: 'Prop `this.props` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `this.props` must be placed on a new line'}]
   }, {
     code: [
       '<App',
@@ -111,38 +98,33 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '  }} bar',
       '/>'
     ].join('\n'),
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: [
       '<App foo={{',
       '}} bar />'
     ].join('\n'),
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: [
       '<App foo bar={{',
       '}} baz />'
     ].join('\n'),
     options: [{maximum: 2}],
-    errors: [{message: 'Prop `baz` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `baz` must be placed on a new line'}]
   }, {
     code: [
       '<App foo={{',
       '}} {...rest} />'
     ].join('\n'),
-    errors: [{message: 'Prop `rest` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `rest` must be placed on a new line'}]
   }, {
     code: [
       '<App {',
       '  ...this.props',
       '} bar />'
     ].join('\n'),
-    errors: [{message: 'Prop `bar` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `bar` must be placed on a new line'}]
   }, {
     code: [
       '<App {',
@@ -151,8 +133,7 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '  ...rest',
       '} />'
     ].join('\n'),
-    errors: [{message: 'Prop `rest` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `rest` must be placed on a new line'}]
   }, {
     code: [
       '<App',
@@ -161,7 +142,6 @@ ruleTester.run('jsx-max-props-per-line', rule, {
       '/>'
     ].join('\n'),
     options: [{maximum: 2}],
-    errors: [{message: 'Prop `baz` must be placed on a new line'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Prop `baz` must be placed on a new line'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-no-bind.js b/tests/lib/rules/jsx-no-bind.js
index c6f28b3fa8..2d4ef2f7b2 100644
--- a/tests/lib/rules/jsx-no-bind.js
+++ b/tests/lib/rules/jsx-no-bind.js
@@ -12,11 +12,20 @@
 var rule = require('../../../lib/rules/jsx-no-bind');
 var RuleTester = require('eslint').RuleTester;
 
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
+
 // -----------------------------------------------------------------------------
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-no-bind', rule, {
 
   valid: [
diff --git a/tests/lib/rules/jsx-no-comment-textnodes.js b/tests/lib/rules/jsx-no-comment-textnodes.js
index f50a6d55a5..99e3ee35f4 100644
--- a/tests/lib/rules/jsx-no-comment-textnodes.js
+++ b/tests/lib/rules/jsx-no-comment-textnodes.js
@@ -11,11 +11,20 @@
 var rule = require('../../../lib/rules/jsx-no-comment-textnodes');
 var RuleTester = require('eslint').RuleTester;
 
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
+
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-no-comment-textnodes', rule, {
 
   valid: [
@@ -31,7 +40,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -41,7 +49,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -52,7 +59,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -63,7 +69,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  },',
         '});'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -79,7 +84,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -92,13 +96,11 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
         'var foo = require(\'foo\');'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -106,7 +108,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  {/* valid */}',
         '</Foo>'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     },
     {
@@ -115,7 +116,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  &nbsp;https://www.example.com/attachment/download/1',
         '</strong>'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     },
 
@@ -124,14 +124,12 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
       code: [
         '<Foo /* valid */ placeholder={\'foo\'}/>'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     },
     {
       code: [
         '<Foo title={\'foo\' /* valid */}/>'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }
   ],
@@ -145,7 +143,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Comments inside children section of tag should be placed inside braces'}]
     }, {
@@ -156,7 +153,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Comments inside children section of tag should be placed inside braces'}]
     }, {
@@ -171,7 +167,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Comments inside children section of tag should be placed inside braces'}]
     }, {
@@ -188,7 +183,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Comments inside children section of tag should be placed inside braces'}]
     }, {
@@ -205,7 +199,6 @@ ruleTester.run('jsx-no-comment-textnodes', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Comments inside children section of tag should be placed inside braces'}]
     }
diff --git a/tests/lib/rules/jsx-no-duplicate-props.js b/tests/lib/rules/jsx-no-duplicate-props.js
index 277c67426e..6f42601682 100644
--- a/tests/lib/rules/jsx-no-duplicate-props.js
+++ b/tests/lib/rules/jsx-no-duplicate-props.js
@@ -13,8 +13,10 @@ var rule = require('../../../lib/rules/jsx-no-duplicate-props');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -23,7 +25,7 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 
 var expectedError = {
   message: 'No duplicate props allowed',
@@ -36,25 +38,25 @@ var ignoreCaseArgs = [{
 
 ruleTester.run('jsx-no-duplicate-props', rule, {
   valid: [
-    {code: '<App />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} />;', parserOptions: parserOptions},
-    {code: '<App a b c />;', parserOptions: parserOptions},
-    {code: '<App a b c A />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} a b c />;', parserOptions: parserOptions},
-    {code: '<App c {...this.props} a b />;', parserOptions: parserOptions},
-    {code: '<App a="c" b="b" c="a" />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} a="c" b="b" c="a" />;', parserOptions: parserOptions},
-    {code: '<App c="a" {...this.props} a="c" b="b" />;', parserOptions: parserOptions},
-    {code: '<App A a />;', parserOptions: parserOptions},
-    {code: '<App A b a />;', parserOptions: parserOptions},
-    {code: '<App A="a" b="b" B="B" />;', parserOptions: parserOptions}
+    {code: '<App />;'},
+    {code: '<App {...this.props} />;'},
+    {code: '<App a b c />;'},
+    {code: '<App a b c A />;'},
+    {code: '<App {...this.props} a b c />;'},
+    {code: '<App c {...this.props} a b />;'},
+    {code: '<App a="c" b="b" c="a" />;'},
+    {code: '<App {...this.props} a="c" b="b" c="a" />;'},
+    {code: '<App c="a" {...this.props} a="c" b="b" />;'},
+    {code: '<App A a />;'},
+    {code: '<App A b a />;'},
+    {code: '<App A="a" b="b" B="B" />;'}
   ],
   invalid: [
-    {code: '<App a a />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App A b c A />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App a="a" b="b" a="a" />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App A a />;', options: ignoreCaseArgs, errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App a b c A />;', options: ignoreCaseArgs, errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App A="a" b="b" B="B" />;', options: ignoreCaseArgs, errors: [expectedError], parserOptions: parserOptions}
+    {code: '<App a a />;', errors: [expectedError]},
+    {code: '<App A b c A />;', errors: [expectedError]},
+    {code: '<App a="a" b="b" a="a" />;', errors: [expectedError]},
+    {code: '<App A a />;', options: ignoreCaseArgs, errors: [expectedError]},
+    {code: '<App a b c A />;', options: ignoreCaseArgs, errors: [expectedError]},
+    {code: '<App A="a" b="b" B="B" />;', options: ignoreCaseArgs, errors: [expectedError]}
   ]
 });
diff --git a/tests/lib/rules/jsx-no-literals.js b/tests/lib/rules/jsx-no-literals.js
index 7df35e9846..da832058e9 100644
--- a/tests/lib/rules/jsx-no-literals.js
+++ b/tests/lib/rules/jsx-no-literals.js
@@ -11,11 +11,20 @@
 var rule = require('../../../lib/rules/jsx-no-literals');
 var RuleTester = require('eslint').RuleTester;
 
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
+
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-no-literals', rule, {
 
   valid: [
@@ -31,7 +40,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -41,7 +49,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -52,7 +59,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -63,7 +69,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  },',
         '});'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -79,7 +84,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -92,13 +96,11 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
         'var foo = require(\'foo\');'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }, {
       code: [
@@ -106,7 +108,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  {\'blarg\'}',
         '</Foo>'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint'
     }
   ],
@@ -120,7 +121,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -132,7 +132,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -144,7 +143,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -156,7 +154,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  },',
         '});'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -171,7 +168,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -188,7 +184,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }, {
@@ -205,7 +200,6 @@ ruleTester.run('jsx-no-literals', rule, {
         '  }',
         '}'
       ].join('\n'),
-      args: [1],
       parser: 'babel-eslint',
       errors: [{message: 'Missing JSX expression container around literal string'}]
     }
diff --git a/tests/lib/rules/jsx-no-target-blank.js b/tests/lib/rules/jsx-no-target-blank.js
index a09946e144..773bb6a615 100644
--- a/tests/lib/rules/jsx-no-target-blank.js
+++ b/tests/lib/rules/jsx-no-target-blank.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-no-target-blank');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,39 +24,39 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-no-target-blank', rule, {
   valid: [
-    {code: '<a href="foobar"></a>', parserOptions: parserOptions},
-    {code: '<a randomTag></a>', parserOptions: parserOptions},
-    {code: '<a href="foobar" target="_blank" rel="noopener noreferrer"></a>', parserOptions: parserOptions},
-    {code: '<a target="_blank" {...spreadProps} rel="noopener noreferrer"></a>', parserOptions: parserOptions},
-    {code: '<a target="_blank" rel="noopener noreferrer" {...spreadProps}></a>', parserOptions: parserOptions},
-    {code: '<p target="_blank"></p>', parserOptions: parserOptions},
-    {code: '<a href="foobar" target="_BLANK" rel="NOOPENER noreferrer"></a>', parserOptions: parserOptions},
-    {code: '<a target="_blank" rel={relValue}></a>', parserOptions: parserOptions},
-    {code: '<a target={targetValue} rel="noopener noreferrer"></a>', parserOptions: parserOptions}
+    {code: '<a href="foobar"></a>'},
+    {code: '<a randomTag></a>'},
+    {code: '<a href="foobar" target="_blank" rel="noopener noreferrer"></a>'},
+    {code: '<a target="_blank" {...spreadProps} rel="noopener noreferrer"></a>'},
+    {code: '<a target="_blank" rel="noopener noreferrer" {...spreadProps}></a>'},
+    {code: '<p target="_blank"></p>'},
+    {code: '<a href="foobar" target="_BLANK" rel="NOOPENER noreferrer"></a>'},
+    {code: '<a target="_blank" rel={relValue}></a>'},
+    {code: '<a target={targetValue} rel="noopener noreferrer"></a>'}
   ],
   invalid: [{
-    code: '<a target="_blank"></a>', parserOptions: parserOptions,
+    code: '<a target="_blank"></a>',
     errors: [{
       message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
       ' see https://mathiasbynens.github.io/rel-noopener'
     }]
   }, {
-    code: '<a target="_blank" rel=""></a>', parserOptions: parserOptions,
+    code: '<a target="_blank" rel=""></a>',
     errors: [{
       message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
       ' see https://mathiasbynens.github.io/rel-noopener'
     }]
   }, {
-    code: '<a target="_blank" rel="noopenernoreferrer"></a>', parserOptions: parserOptions,
+    code: '<a target="_blank" rel="noopenernoreferrer"></a>',
     errors: [{
       message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
       ' see https://mathiasbynens.github.io/rel-noopener'
     }]
   }, {
-    code: '<a target="_BLANK"></a>', parserOptions: parserOptions,
+    code: '<a target="_BLANK"></a>',
     errors: [{
       message: 'Using target="_blank" without rel="noopener noreferrer" is a security risk:' +
       ' see https://mathiasbynens.github.io/rel-noopener'
diff --git a/tests/lib/rules/jsx-no-undef.js b/tests/lib/rules/jsx-no-undef.js
index e5d5c84888..6749282bfb 100644
--- a/tests/lib/rules/jsx-no-undef.js
+++ b/tests/lib/rules/jsx-no-undef.js
@@ -14,8 +14,9 @@ var rule = require('../../../lib/rules/jsx-no-undef');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,27 +25,21 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 eslint.defineRule('no-undef', require('eslint/lib/rules/no-undef'));
 ruleTester.run('jsx-no-undef', rule, {
   valid: [{
-    code: '/*eslint no-undef:1*/ var React, App; React.render(<App />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React, App; React.render(<App />);'
   }, {
-    code: '/*eslint no-undef:1*/ var React, App; React.render(<App />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React, App; React.render(<App />);'
   }, {
-    code: '/*eslint no-undef:1*/ var React; React.render(<img />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React; React.render(<img />);'
   }, {
-    code: '/*eslint no-undef:1*/ var React; React.render(<x-gif />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React; React.render(<x-gif />);'
   }, {
-    code: '/*eslint no-undef:1*/ var React, app; React.render(<app.Foo />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React, app; React.render(<app.Foo />);'
   }, {
-    code: '/*eslint no-undef:1*/ var React, app; React.render(<app.foo.Bar />);',
-    parserOptions: parserOptions
+    code: '/*eslint no-undef:1*/ var React, app; React.render(<app.foo.Bar />);'
   }, {
     code: [
       '/*eslint no-undef:1*/',
@@ -54,11 +49,9 @@ ruleTester.run('jsx-no-undef', rule, {
       '    return <this.props.tag />',
       '  }',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: 'var React; React.render(<Text />);',
-    parserOptions: parserOptions,
     globals: {
       Text: true
     }
@@ -71,42 +64,37 @@ ruleTester.run('jsx-no-undef', rule, {
       '  );',
       '};'
     ].join('\n'),
+    parserOptions: Object.assign({sourceType: 'module'}, parserOptions),
     options: [{
       allowGlobals: false
     }],
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }],
   invalid: [{
     code: '/*eslint no-undef:1*/ var React; React.render(<App />);',
     errors: [{
       message: '\'App\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '/*eslint no-undef:1*/ var React; React.render(<Appp.Foo />);',
     errors: [{
       message: '\'Appp\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '/*eslint no-undef:1*/ var React; React.render(<Apppp:Foo />);',
     errors: [{
       message: '\'Apppp\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '/*eslint no-undef:1*/ var React; React.render(<appp.Foo />);',
     errors: [{
       message: '\'appp\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: '/*eslint no-undef:1*/ var React; React.render(<appp.foo.Bar />);',
     errors: [{
       message: '\'appp\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'const TextWrapper = function (props) {',
@@ -116,6 +104,7 @@ ruleTester.run('jsx-no-undef', rule, {
       '};',
       'export default TextWrapper;'
     ].join('\n'),
+    parserOptions: Object.assign({sourceType: 'module'}, parserOptions),
     errors: [{
       message: '\'Text\' is not defined.'
     }],
@@ -123,7 +112,6 @@ ruleTester.run('jsx-no-undef', rule, {
       allowGlobals: false
     }],
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     globals: {
       Text: true
     }
@@ -131,7 +119,6 @@ ruleTester.run('jsx-no-undef', rule, {
     code: '/*eslint no-undef:1*/ var React; React.render(<Foo />);',
     errors: [{
       message: '\'Foo\' is not defined.'
-    }],
-    parserOptions: parserOptions
+    }]
   }]
 });
diff --git a/tests/lib/rules/jsx-pascal-case.js b/tests/lib/rules/jsx-pascal-case.js
index 752b5f50f2..1309b2b1b2 100644
--- a/tests/lib/rules/jsx-pascal-case.js
+++ b/tests/lib/rules/jsx-pascal-case.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-pascal-case');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,65 +24,48 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-pascal-case', rule, {
   valid: [{
-    code: '<testComponent />',
-    parserOptions: parserOptions
+    code: '<testComponent />'
   }, {
-    code: '<test_component />',
-    parserOptions: parserOptions
+    code: '<test_component />'
   }, {
-    code: '<TestComponent />',
-    parserOptions: parserOptions
+    code: '<TestComponent />'
   }, {
-    code: '<CSSTransitionGroup />',
-    parserOptions: parserOptions
+    code: '<CSSTransitionGroup />'
   }, {
-    code: '<BetterThanCSS />',
-    parserOptions: parserOptions
+    code: '<BetterThanCSS />'
   }, {
-    code: '<TestComponent><div /></TestComponent>',
-    parserOptions: parserOptions
+    code: '<TestComponent><div /></TestComponent>'
   }, {
-    code: '<Test1Component />',
-    parserOptions: parserOptions
+    code: '<Test1Component />'
   }, {
-    code: '<TestComponent1 />',
-    parserOptions: parserOptions
+    code: '<TestComponent1 />'
   }, {
-    code: '<T3stComp0nent />',
-    parserOptions: parserOptions
+    code: '<T3stComp0nent />'
   }, {
-    code: '<T />',
-    parserOptions: parserOptions
+    code: '<T />'
   }, {
     code: '<YMCA />',
-    parserOptions: parserOptions,
     options: [{allowAllCaps: true}]
   }, {
-    code: '<Modal.Header />',
-    parserOptions: parserOptions
+    code: '<Modal.Header />'
   }, {
-    code: '<Modal:Header />',
-    parserOptions: parserOptions
+    code: '<Modal:Header />'
   }, {
     code: '<IGNORED />',
-    parserOptions: parserOptions,
     options: [{ignore: ['IGNORED']}]
   }],
 
   invalid: [{
     code: '<Test_component />',
-    parserOptions: parserOptions,
     errors: [{message: 'Imported JSX component Test_component must be in PascalCase'}]
   }, {
     code: '<TEST_COMPONENT />',
-    parserOptions: parserOptions,
     errors: [{message: 'Imported JSX component TEST_COMPONENT must be in PascalCase'}]
   }, {
     code: '<YMCA />',
-    parserOptions: parserOptions,
     errors: [{message: 'Imported JSX component YMCA must be in PascalCase'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-sort-props.js b/tests/lib/rules/jsx-sort-props.js
index 1664baae0d..702243de5d 100644
--- a/tests/lib/rules/jsx-sort-props.js
+++ b/tests/lib/rules/jsx-sort-props.js
@@ -13,8 +13,10 @@ var rule = require('../../../lib/rules/jsx-sort-props');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -23,7 +25,7 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 
 var expectedError = {
   message: 'Props should be sorted alphabetically',
@@ -92,152 +94,132 @@ var reservedFirstAsInvalidArrayArgs = [{
 
 ruleTester.run('jsx-sort-props', rule, {
   valid: [
-    {code: '<App />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} />;', parserOptions: parserOptions},
-    {code: '<App a b c />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} a b c />;', parserOptions: parserOptions},
-    {code: '<App c {...this.props} a b />;', parserOptions: parserOptions},
-    {code: '<App a="c" b="b" c="a" />;', parserOptions: parserOptions},
-    {code: '<App {...this.props} a="c" b="b" c="a" />;', parserOptions: parserOptions},
-    {code: '<App c="a" {...this.props} a="c" b="b" />;', parserOptions: parserOptions},
-    {code: '<App A a />;', parserOptions: parserOptions},
+    {code: '<App />;'},
+    {code: '<App {...this.props} />;'},
+    {code: '<App a b c />;'},
+    {code: '<App {...this.props} a b c />;'},
+    {code: '<App c {...this.props} a b />;'},
+    {code: '<App a="c" b="b" c="a" />;'},
+    {code: '<App {...this.props} a="c" b="b" c="a" />;'},
+    {code: '<App c="a" {...this.props} a="c" b="b" />;'},
+    {code: '<App A a />;'},
     // Ignoring case
-    {code: '<App a A />;', options: ignoreCaseArgs, parserOptions: parserOptions},
-    {code: '<App a B c />;', options: ignoreCaseArgs, parserOptions: parserOptions},
-    {code: '<App A b C />;', options: ignoreCaseArgs, parserOptions: parserOptions},
+    {code: '<App a A />;', options: ignoreCaseArgs},
+    {code: '<App a B c />;', options: ignoreCaseArgs},
+    {code: '<App A b C />;', options: ignoreCaseArgs},
     // Sorting callbacks below all other props
-    {code: '<App a z onBar onFoo />;', options: callbacksLastArgs, parserOptions: parserOptions},
+    {code: '<App a z onBar onFoo />;', options: callbacksLastArgs},
     // Sorting shorthand props before others
-    {code: '<App a b="b" />;', options: shorthandFirstArgs, parserOptions: parserOptions},
-    {code: '<App z a="a" />;', options: shorthandFirstArgs, parserOptions: parserOptions},
-    {code: '<App x y z a="a" b="b" />;', options: shorthandFirstArgs, parserOptions: parserOptions},
-    {code: '<App a="a" b="b" x y z />;', options: shorthandLastArgs, parserOptions: parserOptions},
+    {code: '<App a b="b" />;', options: shorthandFirstArgs},
+    {code: '<App z a="a" />;', options: shorthandFirstArgs},
+    {code: '<App x y z a="a" b="b" />;', options: shorthandFirstArgs},
+    {code: '<App a="a" b="b" x y z />;', options: shorthandLastArgs},
     {
       code: '<App a="a" b="b" x y z onBar onFoo />;',
-      options: shorthandAndCallbackLastArgs,
-      parserOptions: parserOptions
+      options: shorthandAndCallbackLastArgs
     },
     // noSortAlphabetically
-    {code: '<App a b />;', options: noSortAlphabeticallyArgs, parserOptions: parserOptions},
-    {code: '<App b a />;', options: noSortAlphabeticallyArgs, parserOptions: parserOptions},
+    {code: '<App a b />;', options: noSortAlphabeticallyArgs},
+    {code: '<App b a />;', options: noSortAlphabeticallyArgs},
     // reservedFirst
     {
       code: '<App children={<App />} key={0} ref="r" a b c />',
-      options: reservedFirstAsBooleanArgs,
-      parserOptions: parserOptions
+      options: reservedFirstAsBooleanArgs
     },
     {
       code: '<App children={<App />} key={0} ref="r" a b c dangerouslySetInnerHTML={{__html: "EPR"}} />',
-      options: reservedFirstAsBooleanArgs,
-      parserOptions: parserOptions
+      options: reservedFirstAsBooleanArgs
     },
     {
       code: '<App children={<App />} key={0} a ref="r" />',
-      options: reservedFirstAsArrayArgs,
-      parserOptions: parserOptions
+      options: reservedFirstAsArrayArgs
     },
     {
       code: '<App children={<App />} key={0} a dangerouslySetInnerHTML={{__html: "EPR"}} ref="r" />',
-      options: reservedFirstAsArrayArgs,
-      parserOptions: parserOptions
+      options: reservedFirstAsArrayArgs
     },
     {
       code: '<App ref="r" key={0} children={<App />} b a c />',
-      options: reservedFirstWithNoSortAlphabeticallyArgs,
-      parserOptions: parserOptions
+      options: reservedFirstWithNoSortAlphabeticallyArgs
     },
     {
       code: '<div ref="r" dangerouslySetInnerHTML={{__html: "EPR"}} key={0} children={<App />} b a c />',
-      options: reservedFirstWithNoSortAlphabeticallyArgs,
-      parserOptions: parserOptions
+      options: reservedFirstWithNoSortAlphabeticallyArgs
     }
   ],
   invalid: [
-    {code: '<App b a />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App {...this.props} b a />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App c {...this.props} b a />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App a A />;', errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App B a />;', options: ignoreCaseArgs, errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App B A c />;', options: ignoreCaseArgs, errors: [expectedError], parserOptions: parserOptions},
-    {code: '<App c="a" a="c" b="b" />;', errors: 2, parserOptions: parserOptions},
-    {code: '<App {...this.props} c="a" a="c" b="b" />;', errors: 2, parserOptions: parserOptions},
-    {code: '<App d="d" b="b" {...this.props} c="a" a="c" />;', errors: 2, parserOptions: parserOptions},
+    {code: '<App b a />;', errors: [expectedError]},
+    {code: '<App {...this.props} b a />;', errors: [expectedError]},
+    {code: '<App c {...this.props} b a />;', errors: [expectedError]},
+    {code: '<App a A />;', errors: [expectedError]},
+    {code: '<App B a />;', options: ignoreCaseArgs, errors: [expectedError]},
+    {code: '<App B A c />;', options: ignoreCaseArgs, errors: [expectedError]},
+    {code: '<App c="a" a="c" b="b" />;', errors: 2},
+    {code: '<App {...this.props} c="a" a="c" b="b" />;', errors: 2},
+    {code: '<App d="d" b="b" {...this.props} c="a" a="c" />;', errors: 2},
     {
       code: '<App a z onFoo onBar />;',
       errors: [expectedError],
-      options: callbacksLastArgs,
-      parserOptions: parserOptions
+      options: callbacksLastArgs
     }, {
       code: '<App a onBar onFoo z />;',
       errors: [expectedCallbackError],
-      options: callbacksLastArgs,
-      parserOptions: parserOptions
+      options: callbacksLastArgs
     }, {
       code: '<App a="a" b />;',
       errors: [expectedShorthandFirstError],
-      options: shorthandFirstArgs,
-      parserOptions: parserOptions
+      options: shorthandFirstArgs
     },
-    {code: '<App z x a="a" />;', errors: [expectedError], options: shorthandFirstArgs, parserOptions: parserOptions}, {
+    {code: '<App z x a="a" />;', errors: [expectedError], options: shorthandFirstArgs}, {
       code: '<App b a="a" />;',
       errors: [expectedShorthandLastError],
-      options: shorthandLastArgs,
-      parserOptions: parserOptions
+      options: shorthandLastArgs
     }, {
       code: '<App a="a" onBar onFoo z x />;',
       errors: [shorthandAndCallbackLastArgs],
-      options: shorthandLastArgs,
-      parserOptions: parserOptions
+      options: shorthandLastArgs
     },
-    {code: '<App b a />;', errors: [expectedError], options: sortAlphabeticallyArgs, parserOptions: parserOptions},
+    {code: '<App b a />;', errors: [expectedError], options: sortAlphabeticallyArgs},
     // reservedFirst
     {
       code: '<App a key={1} />',
       options: reservedFirstAsBooleanArgs,
-      errors: [expectedReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedReservedFirstError]
     },
     {
       code: '<div a dangerouslySetInnerHTML={{__html: "EPR"}} />',
       options: reservedFirstAsBooleanArgs,
-      errors: [expectedReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedReservedFirstError]
     },
     {
       code: '<App ref="r" key={2} b />',
       options: reservedFirstAsBooleanArgs,
-      errors: [expectedError],
-      parserOptions: parserOptions
+      errors: [expectedError]
     },
     {
       code: '<App dangerouslySetInnerHTML={{__html: "EPR"}} key={2} b />',
       options: reservedFirstAsBooleanArgs,
-      errors: [expectedReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedReservedFirstError]
     },
     {
       code: '<App key={3} children={<App />} />',
       options: reservedFirstAsArrayArgs,
-      errors: [expectedError],
-      parserOptions: parserOptions
+      errors: [expectedError]
     },
     {
       code: '<App z ref="r" />',
       options: reservedFirstWithNoSortAlphabeticallyArgs,
-      errors: [expectedReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedReservedFirstError]
     },
     {
       code: '<App key={4} />',
       options: reservedFirstAsEmptyArrayArgs,
-      errors: [expectedEmptyReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedEmptyReservedFirstError]
     },
     {
       code: '<App key={5} />',
       options: reservedFirstAsInvalidArrayArgs,
-      errors: [expectedInvalidReservedFirstError],
-      parserOptions: parserOptions
+      errors: [expectedInvalidReservedFirstError]
     }
   ]
 });
diff --git a/tests/lib/rules/jsx-space-before-closing.js b/tests/lib/rules/jsx-space-before-closing.js
index 1f09792d19..0f31134d0b 100644
--- a/tests/lib/rules/jsx-space-before-closing.js
+++ b/tests/lib/rules/jsx-space-before-closing.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-space-before-closing');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,85 +24,69 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-space-before-closing', rule, {
   valid: [{
-    code: '<App />',
-    parserOptions: parserOptions
+    code: '<App />'
   }, {
-    code: '<App foo />',
-    parserOptions: parserOptions
+    code: '<App foo />'
   }, {
-    code: '<App foo={bar} />',
-    parserOptions: parserOptions
+    code: '<App foo={bar} />'
   }, {
-    code: '<App {...props} />',
-    parserOptions: parserOptions
+    code: '<App {...props} />'
   }, {
-    code: '<App></App>',
-    parserOptions: parserOptions
+    code: '<App></App>'
   }, {
     code: [
       '<App',
       '  foo={bar}',
       '/>'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: '<App/>',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo/>',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App foo={bar}/>',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App {...props}/>',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: '<App></App>',
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: [
       '<App',
       '  foo={bar}',
       '/>'
     ].join('\n'),
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }],
 
   invalid: [{
     code: '<App/>',
     output: '<App />',
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before closing bracket'}
     ]
   }, {
     code: '<App foo/>',
     output: '<App foo />',
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before closing bracket'}
     ]
   }, {
     code: '<App foo={bar}/>',
     output: '<App foo={bar} />',
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before closing bracket'}
     ]
   }, {
     code: '<App {...props}/>',
     output: '<App {...props} />',
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is required before closing bracket'}
     ]
@@ -108,7 +94,6 @@ ruleTester.run('jsx-space-before-closing', rule, {
     code: '<App />',
     output: '<App/>',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is forbidden before closing bracket'}
     ]
@@ -116,7 +101,6 @@ ruleTester.run('jsx-space-before-closing', rule, {
     code: '<App foo />',
     output: '<App foo/>',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is forbidden before closing bracket'}
     ]
@@ -124,7 +108,6 @@ ruleTester.run('jsx-space-before-closing', rule, {
     code: '<App foo={bar} />',
     output: '<App foo={bar}/>',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is forbidden before closing bracket'}
     ]
@@ -132,7 +115,6 @@ ruleTester.run('jsx-space-before-closing', rule, {
     code: '<App {...props} />',
     output: '<App {...props}/>',
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [
       {message: 'A space is forbidden before closing bracket'}
     ]
diff --git a/tests/lib/rules/jsx-tag-spacing.js b/tests/lib/rules/jsx-tag-spacing.js
index 5a6f954ff6..782f1044a2 100644
--- a/tests/lib/rules/jsx-tag-spacing.js
+++ b/tests/lib/rules/jsx-tag-spacing.js
@@ -13,8 +13,10 @@ var rule = require('../../../lib/rules/jsx-tag-spacing');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -53,9 +55,7 @@ function afterOpeningOptions(option) {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester({
-  parserOptions: parserOptions
-});
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-tag-spacing', rule, {
   valid: [{
     code: '<App />'
diff --git a/tests/lib/rules/jsx-uses-react.js b/tests/lib/rules/jsx-uses-react.js
index b14058b776..e87cf044dc 100644
--- a/tests/lib/rules/jsx-uses-react.js
+++ b/tests/lib/rules/jsx-uses-react.js
@@ -14,8 +14,10 @@ var rule = require('eslint/lib/rules/no-unused-vars');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -30,23 +32,23 @@ var settings = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 eslint.defineRule('jsx-uses-react', require('../../../lib/rules/jsx-uses-react'));
 ruleTester.run('no-unused-vars', rule, {
   valid: [
-    {code: '/*eslint jsx-uses-react:1*/ var React; <div />;', parserOptions: parserOptions},
-    {code: '/*eslint jsx-uses-react:1*/ var React; (function () { <div /> })();', parserOptions: parserOptions},
-    {code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var Foo; <div />;', parserOptions: parserOptions},
-    {code: '/*eslint jsx-uses-react:1*/ var Foo; <div />;', settings: settings, parserOptions: parserOptions}
+    {code: '/*eslint jsx-uses-react:1*/ var React; <div />;'},
+    {code: '/*eslint jsx-uses-react:1*/ var React; (function () { <div /> })();'},
+    {code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var Foo; <div />;'},
+    {code: '/*eslint jsx-uses-react:1*/ var Foo; <div />;', settings: settings}
   ],
   invalid: [{
     code: '/*eslint jsx-uses-react:1*/ var React;',
-    errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' is defined but never used.'}]
   }, {
     code: '/*eslint jsx-uses-react:1*/ /** @jsx Foo */ var React; <div />;',
-    errors: [{message: '\'React\' is defined but never used.'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' is defined but never used.'}]
   }, {
     code: '/*eslint jsx-uses-react:1*/ var React; <div />;',
-    errors: [{message: '\'React\' is defined but never used.'}], settings: settings, parserOptions: parserOptions
+    errors: [{message: '\'React\' is defined but never used.'}], settings: settings
   }]
 });
diff --git a/tests/lib/rules/jsx-uses-vars.js b/tests/lib/rules/jsx-uses-vars.js
index 57e1bee67c..80c27c6705 100644
--- a/tests/lib/rules/jsx-uses-vars.js
+++ b/tests/lib/rules/jsx-uses-vars.js
@@ -15,8 +15,10 @@ var rulePreferConst = require('eslint/lib/rules/prefer-const');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -27,7 +29,7 @@ require('babel-eslint');
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 eslint.defineRule('jsx-uses-vars', require('../../../lib/rules/jsx-uses-vars'));
 ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
   valid: [
@@ -40,30 +42,26 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           return bar;
         };
         foo()
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         var App;
         React.render(<App/>);
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         var App;
         React.render(<App/>);
       `,
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         var a = 1;
         React.render(<img src={a} />);
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -72,29 +70,25 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           return <App />;
         }
         f();
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         var App;
         <App.Hello />
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         var App;
         <App:Hello />
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         class HelloMessage {}
         <HelloMessage />
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -105,8 +99,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           }
         }
         <HelloMessage />
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -116,8 +109,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           return bar;
         };
         foo()
-      `,
-      parserOptions: parserOptions
+      `
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -127,15 +119,13 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
           return bar;
         };
         foo()
-      `,
-      parserOptions: parserOptions
+      `
     }
   ],
   invalid: [
     {
       code: '/* eslint jsx-uses-vars: 1 */ var App;',
-      errors: [{message: '\'App\' is defined but never used.'}],
-      parserOptions: parserOptions
+      errors: [{message: '\'App\' is defined but never used.'}]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -143,8 +133,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var unused;
         React.render(<App unused=""/>);
       `,
-      errors: [{message: '\'unused\' is defined but never used.'}],
-      parserOptions: parserOptions
+      errors: [{message: '\'unused\' is defined but never used.'}]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -152,8 +141,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var Hello;
         React.render(<App:Hello/>);
       `,
-      errors: [{message: '\'Hello\' is defined but never used.'}],
-      parserOptions: parserOptions
+      errors: [{message: '\'Hello\' is defined but never used.'}]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -161,15 +149,13 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         var Input;
         React.render(<Button.Input unused=""/>);
       `,
-      errors: [{message: '\'Input\' is defined but never used.'}],
-      parserOptions: parserOptions
+      errors: [{message: '\'Input\' is defined but never used.'}]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
         class unused {}
       `,
-      errors: [{message: '\'unused\' is defined but never used.'}],
-      parserOptions: parserOptions
+      errors: [{message: '\'unused\' is defined but never used.'}]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -183,8 +169,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
       errors: [{
         message: '\'HelloMessage\' is defined but never used.',
         line: 3
-      }],
-      parserOptions: parserOptions
+      }]
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -199,8 +184,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         message: '\'HelloMessage\' is defined but never used.',
         line: 3
       }],
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: `
         /* eslint jsx-uses-vars: 1 */
@@ -215,8 +199,7 @@ ruleTester.run('no-unused-vars', ruleNoUnusedVars, {
         message: '\'Hello\' is defined but never used.',
         line: 3
       }],
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }
   ]
 });
@@ -230,15 +213,13 @@ ruleTester.run('prefer-const', rulePreferConst, {
       'let App = <div />;',
       '<App />;'
     ].join('\n'),
-    errors: [{message: '\'App\' is never reassigned. Use \'const\' instead.'}],
-    parserOptions: parserOptions
+    errors: [{message: '\'App\' is never reassigned. Use \'const\' instead.'}]
   }, {
     code: [
       '/* eslint jsx-uses-vars:1 */',
       'let filters = \'foo\';',
       '<div>{filters}</div>;'
     ].join('\n'),
-    errors: [{message: '\'filters\' is never reassigned. Use \'const\' instead.'}],
-    parserOptions: parserOptions
+    errors: [{message: '\'filters\' is never reassigned. Use \'const\' instead.'}]
   }]
 });
diff --git a/tests/lib/rules/jsx-wrap-multilines.js b/tests/lib/rules/jsx-wrap-multilines.js
index 714b1a6c15..45e926b547 100644
--- a/tests/lib/rules/jsx-wrap-multilines.js
+++ b/tests/lib/rules/jsx-wrap-multilines.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/jsx-wrap-multilines');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -136,73 +138,55 @@ var ARROW_NO_PAREN = `
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('jsx-wrap-multilines', rule, {
 
   valid: [
     {
-      code: RETURN_SINGLE_LINE,
-      parserOptions: parserOptions
+      code: RETURN_SINGLE_LINE
     }, {
-      code: RETURN_PAREN,
-      parserOptions: parserOptions
+      code: RETURN_PAREN
     }, {
       code: RETURN_NO_PAREN,
-      options: [{return: false}],
-      parserOptions: parserOptions
+      options: [{return: false}]
     }, {
-      code: DECLARATION_TERNARY_SINGLE_LINE,
-      parserOptions: parserOptions
+      code: DECLARATION_TERNARY_SINGLE_LINE
     }, {
-      code: DECLARATION_TERNARY_PAREN,
-      parserOptions: parserOptions
+      code: DECLARATION_TERNARY_PAREN
     }, {
       code: DECLARATION_TERNARY_NO_PAREN,
-      options: [{declaration: false}],
-      parserOptions: parserOptions
+      options: [{declaration: false}]
     }, {
-      code: ASSIGNMENT_TERNARY_SINGLE_LINE,
-      parserOptions: parserOptions
+      code: ASSIGNMENT_TERNARY_SINGLE_LINE
     }, {
-      code: ASSIGNMENT_TERNARY_PAREN,
-      parserOptions: parserOptions
+      code: ASSIGNMENT_TERNARY_PAREN
     }, {
       code: ASSIGNMENT_TERNARY_NO_PAREN,
-      options: [{assignment: false}],
-      parserOptions: parserOptions
+      options: [{assignment: false}]
     }, {
-      code: DECLARATION_SINGLE_LINE,
-      parserOptions: parserOptions
+      code: DECLARATION_SINGLE_LINE
     }, {
-      code: DECLARATION_PAREN,
-      parserOptions: parserOptions
+      code: DECLARATION_PAREN
     }, {
       code: DECLARATION_NO_PAREN,
-      options: [{declaration: false}],
-      parserOptions: parserOptions
+      options: [{declaration: false}]
     }, {
       code: ASSIGNMENT_SINGLE_LINE,
-      options: [{declaration: false}],
-      parserOptions: parserOptions
+      options: [{declaration: false}]
     }, {
-      code: ASSIGNMENT_PAREN,
-      parserOptions: parserOptions
+      code: ASSIGNMENT_PAREN
     }, {
       code: ASSIGNMENT_NO_PAREN,
-      options: [{assignment: false}],
-      parserOptions: parserOptions
+      options: [{assignment: false}]
     }, {
       code: ARROW_PAREN,
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: ARROW_SINGLE_LINE,
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: ARROW_NO_PAREN,
-      options: [{arrow: false}],
-      parserOptions: parserOptions
+      options: [{arrow: false}]
     }
   ],
 
@@ -210,18 +194,15 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     {
       code: RETURN_NO_PAREN,
       output: RETURN_PAREN,
-      parserOptions: parserOptions,
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: RETURN_NO_PAREN,
       output: RETURN_PAREN,
-      parserOptions: parserOptions,
       options: [{return: true}],
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: DECLARATION_TERNARY_NO_PAREN,
       output: DECLARATION_TERNARY_PAREN,
-      parserOptions: parserOptions,
       errors: [
         {message: 'Missing parentheses around multilines JSX'},
         {message: 'Missing parentheses around multilines JSX'}
@@ -229,7 +210,6 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     }, {
       code: ASSIGNMENT_TERNARY_NO_PAREN,
       output: ASSIGNMENT_TERNARY_PAREN,
-      parserOptions: parserOptions,
       errors: [
         {message: 'Missing parentheses around multilines JSX'},
         {message: 'Missing parentheses around multilines JSX'}
@@ -237,29 +217,24 @@ ruleTester.run('jsx-wrap-multilines', rule, {
     }, {
       code: DECLARATION_NO_PAREN,
       output: DECLARATION_PAREN,
-      parserOptions: parserOptions,
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: DECLARATION_NO_PAREN,
       output: DECLARATION_PAREN,
-      parserOptions: parserOptions,
       options: [{declaration: true}],
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: ASSIGNMENT_NO_PAREN,
       output: ASSIGNMENT_PAREN,
-      parserOptions: parserOptions,
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: ASSIGNMENT_NO_PAREN,
       output: ASSIGNMENT_PAREN,
-      parserOptions: parserOptions,
       options: [{assignment: true}],
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }, {
       code: ARROW_NO_PAREN,
       output: ARROW_PAREN,
-      parserOptions: parserOptions,
       options: [{arrow: true}],
       errors: [{message: 'Missing parentheses around multilines JSX'}]
     }
diff --git a/tests/lib/rules/no-array-index-key.js b/tests/lib/rules/no-array-index-key.js
index 7bb37b49cc..3bcd60488e 100644
--- a/tests/lib/rules/no-array-index-key.js
+++ b/tests/lib/rules/no-array-index-key.js
@@ -13,7 +13,8 @@ var rule = require('../../../lib/rules/no-array-index-key');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -24,47 +25,40 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-array-index-key', rule, {
   valid: [
-    {code: '<Foo key="foo" />;', parserOptions: parserOptions},
-    {code: '<Foo key={i} />;', parserOptions: parserOptions},
-    {code: '<Foo key={`foo-${i}`} />;', parserOptions: parserOptions},
-    {code: '<Foo key={\'foo-\' + i} />;', parserOptions: parserOptions},
+    {code: '<Foo key="foo" />;'},
+    {code: '<Foo key={i} />;'},
+    {code: '<Foo key={`foo-${i}`} />;'},
+    {code: '<Foo key={\'foo-\' + i} />;'},
 
     {
-      code: 'foo.bar((baz, i) => <Foo key={i} />)',
-      parserOptions: parserOptions
+      code: 'foo.bar((baz, i) => <Foo key={i} />)'
     },
 
     {
-      code: 'foo.bar((bar, i) => <Foo key={`foo-${i}`} />)',
-      parserOptions: parserOptions
+      code: 'foo.bar((bar, i) => <Foo key={`foo-${i}`} />)'
     },
 
     {
-      code: 'foo.bar((bar, i) => <Foo key={\'foo-\' + i} />)',
-      parserOptions: parserOptions
+      code: 'foo.bar((bar, i) => <Foo key={\'foo-\' + i} />)'
     },
 
     {
-      code: 'foo.map((baz) => <Foo key={baz.id} />)',
-      parserOptions: parserOptions
+      code: 'foo.map((baz) => <Foo key={baz.id} />)'
     },
 
     {
-      code: 'foo.map((baz, i) => <Foo key={baz.id} />)',
-      parserOptions: parserOptions
+      code: 'foo.map((baz, i) => <Foo key={baz.id} />)'
     },
 
     {
-      code: 'foo.map((baz, i) => <Foo key={\'foo\' + baz.id} />)',
-      parserOptions: parserOptions
+      code: 'foo.map((baz, i) => <Foo key={\'foo\' + baz.id} />)'
     },
 
     {
-      code: 'foo.map((baz, i) => React.cloneElement(someChild, { ...someChild.props }))',
-      parserOptions: parserOptions
+      code: 'foo.map((baz, i) => React.cloneElement(someChild, { ...someChild.props }))'
     },
 
     {
@@ -74,72 +68,60 @@ ruleTester.run('no-array-index-key', rule, {
         '    key: item.id',
         '  })',
         '})'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
 
     {
-      code: 'foo.reduce((a, b) => a.concat(<Foo key={b.id} />), [])',
-      parserOptions: parserOptions
+      code: 'foo.reduce((a, b) => a.concat(<Foo key={b.id} />), [])'
     },
 
     {
-      code: 'foo.reduce((a, b, i) => a.concat(<Foo key={b.id} />), [])',
-      parserOptions: parserOptions
+      code: 'foo.reduce((a, b, i) => a.concat(<Foo key={b.id} />), [])'
     },
 
     {
-      code: 'foo.reduceRight((a, b) => a.concat(<Foo key={b.id} />), [])',
-      parserOptions: parserOptions
+      code: 'foo.reduceRight((a, b) => a.concat(<Foo key={b.id} />), [])'
     },
 
     {
-      code: 'foo.reduceRight((a, b, i) => a.concat(<Foo key={b.id} />), [])',
-      parserOptions: parserOptions
+      code: 'foo.reduceRight((a, b, i) => a.concat(<Foo key={b.id} />), [])'
     }
   ],
 
   invalid: [
     {
       code: 'foo.map((bar, i) => <Foo key={i} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: '[{}, {}].map((bar, i) => <Foo key={i} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, anything) => <Foo key={anything} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => <Foo key={`foo-${i}`} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => <Foo key={\'foo-\' + i} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => <Foo key={\'foo-\' + i + \'-bar\'} />)',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((baz, i) => React.cloneElement(someChild, { ...someChild.props, key: i }))',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
@@ -150,116 +132,97 @@ ruleTester.run('no-array-index-key', rule, {
         '  })',
         '})'
       ].join('\n'),
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.forEach((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.filter((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.some((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.every((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.find((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.findIndex((bar, i) => { baz.push(<Foo key={i} />); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.reduce((a, b, i) => a.concat(<Foo key={i} />), [])',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.reduceRight((a, b, i) => a.concat(<Foo key={i} />), [])',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => React.createElement(\'Foo\', { key: i }))',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => React.createElement(\'Foo\', { key: `foo-${i}` }))',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => React.createElement(\'Foo\', { key: \'foo-\' + i }))',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.map((bar, i) => React.createElement(\'Foo\', { key: \'foo-\' + i + \'-bar\' }))',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.forEach((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.filter((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.some((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.every((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.find((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     },
 
     {
       code: 'foo.findIndex((bar, i) => { baz.push(React.createElement(\'Foo\', { key: i })); })',
-      errors: [{message: 'Do not use Array index in keys'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Do not use Array index in keys'}]
     }
   ]
 });
diff --git a/tests/lib/rules/no-children-prop.js b/tests/lib/rules/no-children-prop.js
index 8232452a4d..3269ccc833 100644
--- a/tests/lib/rules/no-children-prop.js
+++ b/tests/lib/rules/no-children-prop.js
@@ -13,7 +13,8 @@ var rule = require('../../../lib/rules/no-children-prop');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -27,228 +28,177 @@ var CREATE_ELEMENT_ERROR = 'Do not pass children as props. Instead, pass them as
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-children-prop', rule, {
   valid: [
     {
-      code: '<div />;',
-      parserOptions: parserOptions
+      code: '<div />;'
     },
     {
-      code: '<div></div>;',
-      parserOptions: parserOptions
+      code: '<div></div>;'
     },
     {
-      code: 'React.createElement("div", {});',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {});'
     },
     {
-      code: 'React.createElement("div", undefined);',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", undefined);'
     },
     {
-      code: '<div className="class-name"></div>;',
-      parserOptions: parserOptions
+      code: '<div className="class-name"></div>;'
     },
     {
-      code: 'React.createElement("div", {className: "class-name"});',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {className: "class-name"});'
     },
     {
-      code: '<div>Children</div>;',
-      parserOptions: parserOptions
+      code: '<div>Children</div>;'
     },
     {
-      code: 'React.createElement("div", "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", "Children");'
     },
     {
-      code: 'React.createElement("div", {}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, "Children");'
     },
     {
-      code: 'React.createElement("div", undefined, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", undefined, "Children");'
     },
     {
-      code: '<div className="class-name">Children</div>;',
-      parserOptions: parserOptions
+      code: '<div className="class-name">Children</div>;'
     },
     {
-      code: 'React.createElement("div", {className: "class-name"}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {className: "class-name"}, "Children");'
     },
     {
-      code: '<div><div /></div>;',
-      parserOptions: parserOptions
+      code: '<div><div /></div>;'
     },
     {
-      code: 'React.createElement("div", React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", React.createElement("div"));'
     },
     {
-      code: 'React.createElement("div", {}, React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, React.createElement("div"));'
     },
     {
-      code: 'React.createElement("div", undefined, React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", undefined, React.createElement("div"));'
     },
     {
-      code: '<div><div /><div /></div>;',
-      parserOptions: parserOptions
+      code: '<div><div /><div /></div>;'
     },
     {
-      code: 'React.createElement("div", React.createElement("div"), React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", React.createElement("div"), React.createElement("div"));'
     },
     {
-      code: 'React.createElement("div", {}, React.createElement("div"), React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, React.createElement("div"), React.createElement("div"));'
     },
     {
-      code: 'React.createElement("div", undefined, React.createElement("div"), React.createElement("div"));',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", undefined, React.createElement("div"), React.createElement("div"));'
     },
     {
-      code: 'React.createElement("div", [React.createElement("div"), React.createElement("div")]);',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", [React.createElement("div"), React.createElement("div")]);'
     },
     {
-      code: 'React.createElement("div", {}, [React.createElement("div"), React.createElement("div")]);',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, [React.createElement("div"), React.createElement("div")]);'
     },
     {
-      code: 'React.createElement("div", undefined, [React.createElement("div"), React.createElement("div")]);',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", undefined, [React.createElement("div"), React.createElement("div")]);'
     },
     {
-      code: '<MyComponent />',
-      parserOptions: parserOptions
+      code: '<MyComponent />'
     },
     {
-      code: 'React.createElement(MyComponent);',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent);'
     },
     {
-      code: 'React.createElement(MyComponent, {});',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, {});'
     },
     {
-      code: 'React.createElement(MyComponent, undefined);',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, undefined);'
     },
     {
-      code: '<MyComponent>Children</MyComponent>;',
-      parserOptions: parserOptions
+      code: '<MyComponent>Children</MyComponent>;'
     },
     {
-      code: 'React.createElement(MyComponent, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, "Children");'
     },
     {
-      code: 'React.createElement(MyComponent, {}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, {}, "Children");'
     },
     {
-      code: 'React.createElement(MyComponent, undefined, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, undefined, "Children");'
     },
     {
-      code: '<MyComponent className="class-name"></MyComponent>;',
-      parserOptions: parserOptions
+      code: '<MyComponent className="class-name"></MyComponent>;'
     },
     {
-      code: 'React.createElement(MyComponent, {className: "class-name"});',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, {className: "class-name"});'
     },
     {
-      code: '<MyComponent className="class-name">Children</MyComponent>;',
-      parserOptions: parserOptions
+      code: '<MyComponent className="class-name">Children</MyComponent>;'
     },
     {
-      code: 'React.createElement(MyComponent, {className: "class-name"}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, {className: "class-name"}, "Children");'
     },
     {
-      code: '<MyComponent className="class-name" {...props} />;',
-      parserOptions: parserOptions
+      code: '<MyComponent className="class-name" {...props} />;'
     },
     {
-      code: 'React.createElement(MyComponent, {className: "class-name", ...props});',
-      parserOptions: parserOptions
+      code: 'React.createElement(MyComponent, {className: "class-name", ...props});'
     }
   ],
   invalid: [
     {
       code: '<div children="Children" />;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: '<div children={<div />} />;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: '<div children={[<div />, <div />]} />;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: '<div children="Children">Children</div>;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: 'React.createElement("div", {children: "Children"});',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: 'React.createElement("div", {children: "Children"}, "Children");',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: 'React.createElement("div", {children: React.createElement("div")});',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: 'React.createElement("div", {children: [React.createElement("div"), React.createElement("div")]});',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: '<MyComponent children="Children" />',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: 'React.createElement(MyComponent, {children: "Children"});',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: '<MyComponent className="class-name" children="Children" />;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: 'React.createElement(MyComponent, {children: "Children", className: "class-name"});',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     },
     {
       code: '<MyComponent {...props} children="Children" />;',
-      errors: [{message: JSX_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: JSX_ERROR}]
     },
     {
       code: 'React.createElement(MyComponent, {...props, children: "Children"})',
-      errors: [{message: CREATE_ELEMENT_ERROR}],
-      parserOptions: parserOptions
+      errors: [{message: CREATE_ELEMENT_ERROR}]
     }
   ]
 });
diff --git a/tests/lib/rules/no-danger-with-children.js b/tests/lib/rules/no-danger-with-children.js
index 3523656e8b..de0a7abab7 100644
--- a/tests/lib/rules/no-danger-with-children.js
+++ b/tests/lib/rules/no-danger-with-children.js
@@ -12,7 +12,8 @@ var rule = require('../../../lib/rules/no-danger-with-children');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -23,74 +24,61 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-danger-with-children', rule, {
   valid: [
     {
-      code: '<div>Children</div>',
-      parserOptions: parserOptions
+      code: '<div>Children</div>'
     },
     {
       code: '<div {...props} />',
-      parserOptions: parserOptions,
       globals: {
         props: true
       }
     },
     {
-      code: '<div dangerouslySetInnerHTML={{ __html: "HTML" }} />',
-      parserOptions: parserOptions
+      code: '<div dangerouslySetInnerHTML={{ __html: "HTML" }} />'
     },
     {
-      code: '<div children="Children" />',
-      parserOptions: parserOptions
+      code: '<div children="Children" />'
     },
     {
       code: [
         'const props = { dangerouslySetInnerHTML: { __html: "HTML" } };',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'const moreProps = { className: "eslint" };',
         'const props = { children: "Children", ...moreProps };',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'const otherProps = { children: "Children" };',
         'const { a, b, ...props } = otherProps;',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
-      code: '<Hello>Children</Hello>',
-      parserOptions: parserOptions
+      code: '<Hello>Children</Hello>'
     },
     {
-      code: '<Hello dangerouslySetInnerHTML={{ __html: "HTML" }} />',
-      parserOptions: parserOptions
+      code: '<Hello dangerouslySetInnerHTML={{ __html: "HTML" }} />'
     },
     {
-      code: 'React.createElement("div", { dangerouslySetInnerHTML: { __html: "HTML" } });',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", { dangerouslySetInnerHTML: { __html: "HTML" } });'
     },
     {
-      code: 'React.createElement("div", {}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, "Children");'
     },
     {
-      code: 'React.createElement("Hello", { dangerouslySetInnerHTML: { __html: "HTML" } });',
-      parserOptions: parserOptions
+      code: 'React.createElement("Hello", { dangerouslySetInnerHTML: { __html: "HTML" } });'
     },
     {
-      code: 'React.createElement("Hello", {}, "Children");',
-      parserOptions: parserOptions
+      code: 'React.createElement("Hello", {}, "Children");'
     }
   ],
   invalid: [
@@ -100,29 +88,25 @@ ruleTester.run('no-danger-with-children', rule, {
         '  Children',
         '</div>'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: '<div dangerouslySetInnerHTML={{ __html: "HTML" }} children="Children" />',
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
         'const props = { dangerouslySetInnerHTML: { __html: "HTML" } };',
         '<div {...props}>Children</div>'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
         'const props = { children: "Children", dangerouslySetInnerHTML: { __html: "HTML" } };',
         '<div {...props} />'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -130,13 +114,11 @@ ruleTester.run('no-danger-with-children', rule, {
         '  Children',
         '</Hello>'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: '<Hello dangerouslySetInnerHTML={{ __html: "HTML" }} children="Children" />',
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -146,8 +128,7 @@ ruleTester.run('no-danger-with-children', rule, {
         '  "Children"',
         ');'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -159,8 +140,7 @@ ruleTester.run('no-danger-with-children', rule, {
         '  }',
         ');'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -170,8 +150,7 @@ ruleTester.run('no-danger-with-children', rule, {
         '  "Children"',
         ');'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -183,24 +162,21 @@ ruleTester.run('no-danger-with-children', rule, {
         '  }',
         ');'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
         'const props = { dangerouslySetInnerHTML: { __html: "HTML" } };',
         'React.createElement("div", props, "Children");'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
         'const props = { children: "Children", dangerouslySetInnerHTML: { __html: "HTML" } };',
         'React.createElement("div", props);'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     },
     {
       code: [
@@ -209,8 +185,7 @@ ruleTester.run('no-danger-with-children', rule, {
         'const props = { ...otherProps, dangerouslySetInnerHTML: { __html: "HTML" } };',
         'React.createElement("div", props);'
       ].join('\n'),
-      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}],
-      parserOptions: parserOptions
+      errors: [{message: 'Only set one of `children` or `props.dangerouslySetInnerHTML`'}]
     }
   ]
 });
diff --git a/tests/lib/rules/no-danger.js b/tests/lib/rules/no-danger.js
index 8cc5270458..82722f70a9 100644
--- a/tests/lib/rules/no-danger.js
+++ b/tests/lib/rules/no-danger.js
@@ -13,8 +13,10 @@ var rule = require('../../../lib/rules/no-danger');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -23,16 +25,15 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-danger', rule, {
   valid: [
-    {code: '<App />;', parserOptions: parserOptions},
-    {code: '<App dangerouslySetInnerHTML={{ __html: "" }} />;', parserOptions: parserOptions},
-    {code: '<div className="bar"></div>;', parserOptions: parserOptions}
+    {code: '<App />;'},
+    {code: '<App dangerouslySetInnerHTML={{ __html: "" }} />;'},
+    {code: '<div className="bar"></div>;'}
   ],
   invalid: [{
     code: '<div dangerouslySetInnerHTML={{ __html: "" }}></div>;',
-    errors: [{message: 'Dangerous property \'dangerouslySetInnerHTML\' found'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Dangerous property \'dangerouslySetInnerHTML\' found'}]
   }]
 });
diff --git a/tests/lib/rules/no-deprecated.js b/tests/lib/rules/no-deprecated.js
index 9224a69565..86aa688eeb 100644
--- a/tests/lib/rules/no-deprecated.js
+++ b/tests/lib/rules/no-deprecated.js
@@ -12,13 +12,22 @@
 var rule = require('../../../lib/rules/no-deprecated');
 var RuleTester = require('eslint').RuleTester;
 
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
+
 require('babel-eslint');
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-deprecated', rule, {
 
   valid: [
diff --git a/tests/lib/rules/no-did-mount-set-state.js b/tests/lib/rules/no-did-mount-set-state.js
index d4a4c2e43e..16a328f229 100644
--- a/tests/lib/rules/no-did-mount-set-state.js
+++ b/tests/lib/rules/no-did-mount-set-state.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-did-mount-set-state');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-did-mount-set-state', rule, {
 
   valid: [{
@@ -34,15 +36,13 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
       '  componentDidMount: function() {}',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -51,8 +51,7 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '    this.someHandler = this.setState;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -64,8 +63,7 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '    })',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -79,8 +77,7 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }],
 
   invalid: [{
@@ -93,7 +90,6 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidMount'
     }]
@@ -122,7 +118,6 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '});'
     ].join('\n'),
     options: ['disallow-in-func'],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidMount'
     }]
@@ -153,7 +148,6 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentDidMount'
@@ -187,7 +181,6 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidMount'
     }]
@@ -216,7 +209,6 @@ ruleTester.run('no-did-mount-set-state', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentDidMount'
diff --git a/tests/lib/rules/no-did-update-set-state.js b/tests/lib/rules/no-did-update-set-state.js
index 611200b119..7c24339c4c 100644
--- a/tests/lib/rules/no-did-update-set-state.js
+++ b/tests/lib/rules/no-did-update-set-state.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-did-update-set-state');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-did-update-set-state', rule, {
 
   valid: [{
@@ -34,15 +36,13 @@ ruleTester.run('no-did-update-set-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
       '  componentDidUpdate: function() {}',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -51,8 +51,7 @@ ruleTester.run('no-did-update-set-state', rule, {
       '    this.someHandler = this.setState;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -64,8 +63,7 @@ ruleTester.run('no-did-update-set-state', rule, {
       '    })',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -79,8 +77,7 @@ ruleTester.run('no-did-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }],
 
   invalid: [{
@@ -93,7 +90,6 @@ ruleTester.run('no-did-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidUpdate'
     }]
@@ -122,7 +118,6 @@ ruleTester.run('no-did-update-set-state', rule, {
       '});'
     ].join('\n'),
     options: ['disallow-in-func'],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidUpdate'
     }]
@@ -153,7 +148,6 @@ ruleTester.run('no-did-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentDidUpdate'
@@ -187,7 +181,6 @@ ruleTester.run('no-did-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentDidUpdate'
     }]
@@ -216,7 +209,6 @@ ruleTester.run('no-did-update-set-state', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentDidUpdate'
diff --git a/tests/lib/rules/no-direct-mutation-state.js b/tests/lib/rules/no-direct-mutation-state.js
index b4e9d93e84..40cbeecdaa 100644
--- a/tests/lib/rules/no-direct-mutation-state.js
+++ b/tests/lib/rules/no-direct-mutation-state.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-direct-mutation-state');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-direct-mutation-state', rule, {
 
   valid: [{
@@ -34,8 +36,7 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -45,14 +46,12 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '    return <div>Hello {obj.state.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = "foo";',
       'module.exports = {};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class Hello {',
@@ -61,8 +60,7 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '    return this.state.foo;',
       '  }',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -74,7 +72,6 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not mutate state directly. Use setState().'
     }]
@@ -87,7 +84,6 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not mutate state directly. Use setState().'
     }]
@@ -100,7 +96,6 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not mutate state directly. Use setState().'
     }]
@@ -114,7 +109,6 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not mutate state directly. Use setState().',
       line: 3,
@@ -137,7 +131,6 @@ ruleTester.run('no-direct-mutation-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not mutate state directly. Use setState().'
     }]
diff --git a/tests/lib/rules/no-find-dom-node.js b/tests/lib/rules/no-find-dom-node.js
index 4b946c02c7..463d9c2b33 100644
--- a/tests/lib/rules/no-find-dom-node.js
+++ b/tests/lib/rules/no-find-dom-node.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-find-dom-node');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,14 +24,13 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-find-dom-node', rule, {
 
   valid: [{
     code: [
       'var Hello = function() {};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -37,8 +38,7 @@ ruleTester.run('no-find-dom-node', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -50,8 +50,7 @@ ruleTester.run('no-find-dom-node', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -62,8 +61,7 @@ ruleTester.run('no-find-dom-node', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -77,7 +75,6 @@ ruleTester.run('no-find-dom-node', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use findDOMNode'
     }]
@@ -92,7 +89,6 @@ ruleTester.run('no-find-dom-node', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use findDOMNode'
     }]
@@ -107,7 +103,6 @@ ruleTester.run('no-find-dom-node', rule, {
       '  }',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use findDOMNode'
     }]
diff --git a/tests/lib/rules/no-is-mounted.js b/tests/lib/rules/no-is-mounted.js
index f357013532..1c75b496c3 100644
--- a/tests/lib/rules/no-is-mounted.js
+++ b/tests/lib/rules/no-is-mounted.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-is-mounted');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,15 +24,14 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-is-mounted', rule, {
 
   valid: [{
     code: [
       'var Hello = function() {',
       '};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -38,8 +39,7 @@ ruleTester.run('no-is-mounted', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -51,8 +51,7 @@ ruleTester.run('no-is-mounted', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -68,7 +67,6 @@ ruleTester.run('no-is-mounted', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use isMounted'
     }]
@@ -85,7 +83,6 @@ ruleTester.run('no-is-mounted', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use isMounted'
     }]
@@ -102,7 +99,6 @@ ruleTester.run('no-is-mounted', rule, {
       '  }',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use isMounted'
     }]
diff --git a/tests/lib/rules/no-multi-comp.js b/tests/lib/rules/no-multi-comp.js
index fffc443833..9ae1264ae1 100644
--- a/tests/lib/rules/no-multi-comp.js
+++ b/tests/lib/rules/no-multi-comp.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-multi-comp');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-multi-comp', rule, {
 
   valid: [{
@@ -35,8 +37,7 @@ ruleTester.run('no-multi-comp', rule, {
       '    return <Hello name="John" />;',
       '  }',
       '});'
-    ].join('\r'),
-    parserOptions: parserOptions
+    ].join('\r')
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -44,8 +45,7 @@ ruleTester.run('no-multi-comp', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '}'
-    ].join('\r'),
-    parserOptions: parserOptions
+    ].join('\r')
   }, {
     code: [
       'var Heading = createReactClass({',
@@ -59,8 +59,7 @@ ruleTester.run('no-multi-comp', rule, {
       '    );',
       '  }',
       '});'
-    ].join('\r'),
-    parserOptions: parserOptions
+    ].join('\r')
   }, {
     code: [
       'function Hello(props) {',
@@ -85,7 +84,6 @@ ruleTester.run('no-multi-comp', rule, {
       '  }',
       '}'
     ].join('\r'),
-    parserOptions: parserOptions,
     options: [{
       ignoreStateless: true
     }]
@@ -119,7 +117,6 @@ ruleTester.run('no-multi-comp', rule, {
       '  }',
       '});'
     ].join('\r'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Declare only one React component per file',
       line: 6
@@ -142,7 +139,6 @@ ruleTester.run('no-multi-comp', rule, {
       '  }',
       '}'
     ].join('\r'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Declare only one React component per file',
       line: 6
@@ -175,7 +171,6 @@ ruleTester.run('no-multi-comp', rule, {
       '  }',
       '}'
     ].join('\r'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Declare only one React component per file',
       line: 4
diff --git a/tests/lib/rules/no-render-return-value.js b/tests/lib/rules/no-render-return-value.js
index eb8a5c787a..d49b4734ed 100644
--- a/tests/lib/rules/no-render-return-value.js
+++ b/tests/lib/rules/no-render-return-value.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-render-return-value');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,23 +24,20 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-render-return-value', rule, {
 
   valid: [{
     code: [
       'ReactDOM.render(<div />, document.body);'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'let node;',
       'ReactDOM.render(<div ref={ref => node = ref}/>, document.body);'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: 'ReactDOM.render(<div ref={ref => this.node = ref}/>, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.14.0'
@@ -46,7 +45,6 @@ ruleTester.run('no-render-return-value', rule, {
     }
   }, {
     code: 'React.render(<div ref={ref => this.node = ref}/>, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.14.0'
@@ -54,7 +52,6 @@ ruleTester.run('no-render-return-value', rule, {
     }
   }, {
     code: 'React.render(<div ref={ref => this.node = ref}/>, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.13.0'
@@ -67,7 +64,6 @@ ruleTester.run('no-render-return-value', rule, {
     code: [
       'var Hello = ReactDOM.render(<div />, document.body);'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not depend on the return value from ReactDOM.render'
     }]
@@ -77,7 +73,6 @@ ruleTester.run('no-render-return-value', rule, {
       '  inst: ReactDOM.render(<div />, document.body)',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not depend on the return value from ReactDOM.render'
     }]
@@ -87,19 +82,16 @@ ruleTester.run('no-render-return-value', rule, {
       '  return ReactDOM.render(<div />, document.body)',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not depend on the return value from ReactDOM.render'
     }]
   }, {
     code: 'var render = (a, b) => ReactDOM.render(a, b)',
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not depend on the return value from ReactDOM.render'
     }]
   }, {
     code: 'var inst = React.render(<div />, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.14.0'
@@ -110,7 +102,6 @@ ruleTester.run('no-render-return-value', rule, {
     }]
   }, {
     code: 'var inst = ReactDOM.render(<div />, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.14.0'
@@ -121,7 +112,6 @@ ruleTester.run('no-render-return-value', rule, {
     }]
   }, {
     code: 'var inst = React.render(<div />, document.body);',
-    parserOptions: parserOptions,
     settings: {
       react: {
         version: '0.13.0'
diff --git a/tests/lib/rules/no-set-state.js b/tests/lib/rules/no-set-state.js
index 980d48bb26..5787ba05c2 100644
--- a/tests/lib/rules/no-set-state.js
+++ b/tests/lib/rules/no-set-state.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-set-state');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,7 +24,7 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-set-state', rule, {
 
   valid: [{
@@ -30,8 +32,7 @@ ruleTester.run('no-set-state', rule, {
       'var Hello = function() {',
       '  this.setState({})',
       '};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -39,8 +40,7 @@ ruleTester.run('no-set-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -52,8 +52,7 @@ ruleTester.run('no-set-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -69,7 +68,6 @@ ruleTester.run('no-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState'
     }]
@@ -86,7 +84,6 @@ ruleTester.run('no-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState'
     }]
@@ -103,7 +100,6 @@ ruleTester.run('no-set-state', rule, {
       '  }',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState'
     }]
diff --git a/tests/lib/rules/no-string-refs.js b/tests/lib/rules/no-string-refs.js
index 515ceaeb67..64d3f7b49f 100644
--- a/tests/lib/rules/no-string-refs.js
+++ b/tests/lib/rules/no-string-refs.js
@@ -11,13 +11,22 @@
 var rule = require('../../../lib/rules/no-string-refs');
 var RuleTester = require('eslint').RuleTester;
 
+var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
+};
+
 require('babel-eslint');
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-refs', rule, {
 
   valid: [{
@@ -31,10 +40,7 @@ ruleTester.run('no-refs', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parser: 'babel-eslint',
-    ecmaFeatures: {
-      jsx: true
-    }
+    parser: 'babel-eslint'
   }
   ],
 
@@ -50,10 +56,6 @@ ruleTester.run('no-refs', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    ecmaFeatures: {
-      classes: true,
-      jsx: true
-    },
     errors: [{
       message: 'Using this.refs is deprecated.'
     }]
@@ -66,10 +68,6 @@ ruleTester.run('no-refs', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    ecmaFeatures: {
-      classes: true,
-      jsx: true
-    },
     errors: [{
       message: 'Using string literals in ref attributes is deprecated.'
     }]
@@ -82,10 +80,6 @@ ruleTester.run('no-refs', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    ecmaFeatures: {
-      classes: true,
-      jsx: true
-    },
     errors: [{
       message: 'Using string literals in ref attributes is deprecated.'
     }]
@@ -101,10 +95,6 @@ ruleTester.run('no-refs', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    ecmaFeatures: {
-      classes: true,
-      jsx: true
-    },
     errors: [{
       message: 'Using this.refs is deprecated.'
     }, {
diff --git a/tests/lib/rules/no-unescaped-entities.js b/tests/lib/rules/no-unescaped-entities.js
index ddb7f82f2c..cf2c190c69 100644
--- a/tests/lib/rules/no-unescaped-entities.js
+++ b/tests/lib/rules/no-unescaped-entities.js
@@ -10,8 +10,12 @@
 
 var rule = require('../../../lib/rules/no-unescaped-entities');
 var RuleTester = require('eslint').RuleTester;
+
 var parserOptions = {
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -20,7 +24,7 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-unescaped-entities', rule, {
 
   valid: [
@@ -33,8 +37,7 @@ ruleTester.run('no-unescaped-entities', rule, {
         '    );',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -42,8 +45,7 @@ ruleTester.run('no-unescaped-entities', rule, {
         '    return <div>Here is some text!</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -51,8 +53,7 @@ ruleTester.run('no-unescaped-entities', rule, {
         '    return <div>I&rsquo;ve escaped some entities: &gt; &lt; &amp;</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -62,8 +63,7 @@ ruleTester.run('no-unescaped-entities', rule, {
         '    and here are some escaped entities: &gt; &lt; &amp;</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -71,8 +71,7 @@ ruleTester.run('no-unescaped-entities', rule, {
         '    return <div>{">" + "<" + "&" + \'"\'}</div>;',
         '  },',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }
   ],
 
@@ -85,7 +84,6 @@ ruleTester.run('no-unescaped-entities', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{message: 'HTML entities must be escaped.'}]
     }, {
       code: [
@@ -97,7 +95,6 @@ ruleTester.run('no-unescaped-entities', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{message: 'HTML entities must be escaped.'}]
     }, {
       code: [
@@ -107,7 +104,6 @@ ruleTester.run('no-unescaped-entities', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{message: 'HTML entities must be escaped.'}]
     }, {
       code: [
@@ -117,7 +113,6 @@ ruleTester.run('no-unescaped-entities', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: 'HTML entities must be escaped.'},
         {message: 'HTML entities must be escaped.'},
@@ -131,7 +126,6 @@ ruleTester.run('no-unescaped-entities', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{message: 'HTML entities must be escaped.'}]
     }
   ]
diff --git a/tests/lib/rules/no-unknown-property.js b/tests/lib/rules/no-unknown-property.js
index c51aa65b1e..d861081dc9 100644
--- a/tests/lib/rules/no-unknown-property.js
+++ b/tests/lib/rules/no-unknown-property.js
@@ -13,8 +13,10 @@ var rule = require('../../../lib/rules/no-unknown-property');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -23,69 +25,59 @@ var parserOptions = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-unknown-property', rule, {
   valid: [
-    {code: '<App class="bar" />;', parserOptions: parserOptions},
-    {code: '<App for="bar" />;', parserOptions: parserOptions},
-    {code: '<App accept-charset="bar" />;', parserOptions: parserOptions},
-    {code: '<App http-equiv="bar" />;', parserOptions: parserOptions},
-    {code: '<App xlink:href="bar" />;', parserOptions: parserOptions},
-    {code: '<App clip-path="bar" />;', parserOptions: parserOptions},
-    {code: '<div className="bar"></div>;', parserOptions: parserOptions},
-    {code: '<div data-foo="bar"></div>;', parserOptions: parserOptions},
-    {code: '<div class="foo" is="my-elem"></div>;', parserOptions: parserOptions},
-    {code: '<div {...this.props} class="foo" is="my-elem"></div>;', parserOptions: parserOptions},
-    {code: '<atom-panel class="foo"></atom-panel>;', parserOptions: parserOptions}, {
+    {code: '<App class="bar" />;'},
+    {code: '<App for="bar" />;'},
+    {code: '<App accept-charset="bar" />;'},
+    {code: '<App http-equiv="bar" />;'},
+    {code: '<App xlink:href="bar" />;'},
+    {code: '<App clip-path="bar" />;'},
+    {code: '<div className="bar"></div>;'},
+    {code: '<div data-foo="bar"></div>;'},
+    {code: '<div class="foo" is="my-elem"></div>;'},
+    {code: '<div {...this.props} class="foo" is="my-elem"></div>;'},
+    {code: '<atom-panel class="foo"></atom-panel>;'}, {
       code: '<div class="bar"></div>;',
-      options: [{ignore: ['class']}],
-      parserOptions: parserOptions
+      options: [{ignore: ['class']}]
     }
   ],
   invalid: [{
     code: '<div class="bar"></div>;',
     output: '<div className="bar"></div>;',
-    errors: [{message: 'Unknown property \'class\' found, use \'className\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'class\' found, use \'className\' instead'}]
   }, {
     code: '<div for="bar"></div>;',
     output: '<div htmlFor="bar"></div>;',
-    errors: [{message: 'Unknown property \'for\' found, use \'htmlFor\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'for\' found, use \'htmlFor\' instead'}]
   }, {
     code: '<div accept-charset="bar"></div>;',
     output: '<div acceptCharset="bar"></div>;',
-    errors: [{message: 'Unknown property \'accept-charset\' found, use \'acceptCharset\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'accept-charset\' found, use \'acceptCharset\' instead'}]
   }, {
     code: '<div http-equiv="bar"></div>;',
     output: '<div httpEquiv="bar"></div>;',
-    errors: [{message: 'Unknown property \'http-equiv\' found, use \'httpEquiv\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'http-equiv\' found, use \'httpEquiv\' instead'}]
   }, {
     code: '<div accesskey="bar"></div>;',
     output: '<div accessKey="bar"></div>;',
-    errors: [{message: 'Unknown property \'accesskey\' found, use \'accessKey\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'accesskey\' found, use \'accessKey\' instead'}]
   }, {
     code: '<div onclick="bar"></div>;',
     output: '<div onClick="bar"></div>;',
-    errors: [{message: 'Unknown property \'onclick\' found, use \'onClick\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'onclick\' found, use \'onClick\' instead'}]
   }, {
     code: '<div onmousedown="bar"></div>;',
     output: '<div onMouseDown="bar"></div>;',
-    errors: [{message: 'Unknown property \'onmousedown\' found, use \'onMouseDown\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'onmousedown\' found, use \'onMouseDown\' instead'}]
   }, {
     code: '<use xlink:href="bar" />;',
     output: '<use xlinkHref="bar" />;',
-    errors: [{message: 'Unknown property \'xlink:href\' found, use \'xlinkHref\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'xlink:href\' found, use \'xlinkHref\' instead'}]
   }, {
     code: '<rect clip-path="bar" />;',
     output: '<rect clipPath="bar" />;',
-    errors: [{message: 'Unknown property \'clip-path\' found, use \'clipPath\' instead'}],
-    parserOptions: parserOptions
+    errors: [{message: 'Unknown property \'clip-path\' found, use \'clipPath\' instead'}]
   }]
 });
diff --git a/tests/lib/rules/no-unused-prop-types.js b/tests/lib/rules/no-unused-prop-types.js
index 731b3f3430..3f0ddebaf0 100644
--- a/tests/lib/rules/no-unused-prop-types.js
+++ b/tests/lib/rules/no-unused-prop-types.js
@@ -12,7 +12,8 @@ var rule = require('../../../lib/rules/no-unused-prop-types');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -31,7 +32,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-unused-prop-types', rule, {
 
   valid: [
@@ -45,8 +46,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -57,8 +57,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {this.props.name.firstname}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -66,8 +65,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -76,8 +74,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -86,8 +83,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello World {this.props[propName]}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -96,8 +92,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -106,8 +101,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -115,8 +109,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -128,8 +121,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  firstname: PropTypes.string',
         '};',
         'Hello.propTypes.lastname = PropTypes.string;'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -143,8 +135,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {user.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello {',
@@ -152,16 +143,14 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return \'Hello\' + this.props.name;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello {',
         '  method;',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -174,8 +163,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Props validation is ignored when spread is used
       code: [
@@ -192,8 +180,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  icon: PropTypes.bool',
         '};'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -202,8 +189,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello {firstname}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -215,8 +201,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -227,8 +212,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  \'firstname\': PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -242,8 +226,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  \'firstname\': PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -257,8 +240,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  b: PropTypes.string',
         '});'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -275,8 +257,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '};',
         'Hello.propTypes.a.b.c = PropTypes.number;'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -297,8 +278,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -321,8 +301,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -337,8 +316,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    PropTypes.string',
         '  ])',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -362,8 +340,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  ])',
         '};'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -376,8 +353,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  a: PropTypes.instanceOf(Hello)',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -404,8 +380,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  numb: PropTypes.number,',
         '  stri: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -434,8 +409,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  "some.value": PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -447,8 +421,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  "arr": PropTypes.array',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -463,8 +436,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      options: [{skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{skipShapeProps: false}]
     }, {
       code: [
         'var TestComp1 = createReactClass({',
@@ -479,8 +451,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>{icons}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -519,8 +490,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>{nextPath}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -532,8 +502,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -547,8 +516,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -562,8 +530,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -577,8 +544,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator'], skipShapeProps: false}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -590,8 +556,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'class Comp1 extends Component {',
@@ -628,8 +593,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div />;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -638,8 +602,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -652,8 +615,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'Hello.propTypes = {',
         '  users: PropTypes.arrayOf(PropTypes.object)',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -662,8 +624,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return <div>Hello</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -820,8 +781,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    );',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = (props) => {',
@@ -833,8 +793,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = ({ someProp }) => {',
@@ -846,8 +805,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = function({ someProp }) {',
@@ -859,8 +817,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function statelessComponent({ someProp }) {',
@@ -872,29 +829,25 @@ ruleTester.run('no-unused-prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function notAComponent({ something }) {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const notAComponent = function({ something }) {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const notAComponent = ({ something }) => {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Validation is ignored on reassigned props object
       code: [
@@ -1084,8 +1037,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    ...otherPropTypes,',
         '    firstName: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Ignore destructured function arguments
       code: [
@@ -1094,8 +1046,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return ["string"].map(({length}) => <div>{length}</div>);',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Flow annotations on stateless components
       code: [
@@ -1145,8 +1096,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    <div/>',
         '  )',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function JobList(props) {',
@@ -1259,8 +1209,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured function props in the constructor shouldn't throw errors
       code: [
@@ -1274,8 +1223,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured props in the `componentWillReceiveProps` method shouldn't throw errors
       code: [
@@ -1289,8 +1237,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured function props in the `componentWillReceiveProps` method shouldn't throw errors
       code: [
@@ -1303,8 +1250,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured props in the `shouldComponentUpdate` method shouldn't throw errors
       code: [
@@ -1318,8 +1264,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured function props in the `shouldComponentUpdate` method shouldn't throw errors
       code: [
@@ -1332,8 +1277,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured props in the `componentWillUpdate` method shouldn't throw errors
       code: [
@@ -1347,8 +1291,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured function props in the `componentWillUpdate` method shouldn't throw errors
       code: [
@@ -1361,8 +1304,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured props in the `componentDidUpdate` method shouldn't throw errors
       code: [
@@ -1376,8 +1318,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured function props in the `componentDidUpdate` method shouldn't throw errors
       code: [
@@ -1390,8 +1331,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured state props in `componentDidUpdate` [Issue #825]
       code: [
@@ -1404,8 +1344,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       // Destructured state props in `componentDidUpdate` without custom parser [Issue #825]
       code: [
@@ -1417,8 +1356,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '    return something;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Destructured props in a stateless function
       code: [
@@ -1426,8 +1364,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  const {...rest} = props;',
         '  return <div />;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // `no-unused-prop-types` in jsx expressions - [Issue #885]
       code: [
@@ -1444,8 +1381,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  nextPage: PropTypes.func.isRequired,',
         '  previousPage: PropTypes.func.isRequired,',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // `no-unused-prop-types` rest param props in jsx expressions - [Issue #885]
       code: [
@@ -1459,8 +1395,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  nextPage: PropTypes.func.isRequired,',
         '  previousPage: PropTypes.func.isRequired,',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends Component {',
@@ -1475,8 +1410,7 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  foo: PropTypes.bool,',
         '  bar: PropTypes.bool',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }
   ],
 
@@ -1493,9 +1427,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      ecmaFeatures: {
-        jsx: false
-      },
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -1512,7 +1443,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' PropType is defined but prop is never used',
         line: 3,
@@ -1530,7 +1460,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' PropType is defined but prop is never used',
         line: 3,
@@ -1547,7 +1476,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  unused: PropTypes.string',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -1567,7 +1495,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -1588,7 +1515,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }, {
@@ -1606,7 +1532,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  unused: PropTypes.string',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -1624,7 +1549,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  })',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [{
         message: '\'a.b\' PropType is defined but prop is never used'
@@ -1645,7 +1569,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  })',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [{
         message: '\'a.b.c\' PropType is defined but prop is never used'
@@ -1668,7 +1591,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [
         {message: '\'a.*.unused\' PropType is defined but prop is never used'}
@@ -1693,7 +1615,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [
         {message: '\'a.*.unused\' PropType is defined but prop is never used'}
@@ -1720,7 +1641,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  ])',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [
         {message: '\'a.unused\' PropType is defined but prop is never used'},
@@ -1738,7 +1658,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  "some.unused": PropTypes.string',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'some.unused\' PropType is defined but prop is never used'}
       ]
@@ -1758,7 +1677,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{skipShapeProps: false}],
       errors: [
         {message: '\'arr.*.some.unused\' PropType is defined but prop is never used'}
@@ -2119,7 +2037,7 @@ ruleTester.run('no-unused-prop-types', rule, {
       ].join('\n'),
       parser: 'babel-eslint',
       errors: [
-          {message: '\'person.name.unused\' PropType is defined but prop is never used'}
+        {message: '\'person.name.unused\' PropType is defined but prop is never used'}
       ]
     }, {
       code: [
@@ -2133,7 +2051,7 @@ ruleTester.run('no-unused-prop-types', rule, {
       ].join('\n'),
       parser: 'babel-eslint',
       errors: [
-          {message: '\'person.name.unused\' PropType is defined but prop is never used'}
+        {message: '\'person.name.unused\' PropType is defined but prop is never used'}
       ]
     }, {
       code: [
@@ -2151,7 +2069,7 @@ ruleTester.run('no-unused-prop-types', rule, {
       ].join('\n'),
       parser: 'babel-eslint',
       errors: [
-          {message: '\'people.*.name.unused\' PropType is defined but prop is never used'}
+        {message: '\'people.*.name.unused\' PropType is defined but prop is never used'}
       ]
     }, {
       code: [
@@ -2170,7 +2088,7 @@ ruleTester.run('no-unused-prop-types', rule, {
       ].join('\n'),
       parser: 'babel-eslint',
       errors: [
-          {message: '\'people.*.name.unused\' PropType is defined but prop is never used'}
+        {message: '\'people.*.name.unused\' PropType is defined but prop is never used'}
       ]
     }, {
       code: [
@@ -2184,8 +2102,8 @@ ruleTester.run('no-unused-prop-types', rule, {
       ].join('\n'),
       parser: 'babel-eslint',
       errors: [
-          {message: '\'result.ok\' PropType is defined but prop is never used'},
-          {message: '\'result.ok\' PropType is defined but prop is never used'}
+        {message: '\'result.ok\' PropType is defined but prop is never used'},
+        {message: '\'result.ok\' PropType is defined but prop is never used'}
       ]
     }, {
       code: [
@@ -2195,7 +2113,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}',
         'Greetings.propTypes = {unused: Object};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -2206,7 +2123,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         ')',
         'MyComponent.propTypes = {unused: Object};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -2215,7 +2131,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         'const MyComponent = props => props.test ? <div /> : <span />',
         'MyComponent.propTypes = {unused: Object};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used'
       }]
@@ -2246,7 +2161,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2265,7 +2179,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2284,7 +2197,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2302,7 +2214,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2321,7 +2232,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2339,7 +2249,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2358,7 +2267,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2376,7 +2284,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2395,7 +2302,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2413,7 +2319,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'unused\' PropType is defined but prop is never used',
         line: 3,
@@ -2431,7 +2336,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'something\' PropType is defined but prop is never used',
         line: 3,
@@ -2448,7 +2352,6 @@ ruleTester.run('no-unused-prop-types', rule, {
         '  }',
         '})'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'something\' PropType is defined but prop is never used',
         line: 3,
diff --git a/tests/lib/rules/no-will-update-set-state.js b/tests/lib/rules/no-will-update-set-state.js
index 541bd84a71..0450261bc4 100644
--- a/tests/lib/rules/no-will-update-set-state.js
+++ b/tests/lib/rules/no-will-update-set-state.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/no-will-update-set-state');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('no-will-update-set-state', rule, {
 
   valid: [{
@@ -34,15 +36,13 @@ ruleTester.run('no-will-update-set-state', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
       '  componentWillUpdate: function() {}',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -51,8 +51,7 @@ ruleTester.run('no-will-update-set-state', rule, {
       '    this.someHandler = this.setState;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -64,8 +63,7 @@ ruleTester.run('no-will-update-set-state', rule, {
       '    })',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -79,8 +77,7 @@ ruleTester.run('no-will-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }],
 
   invalid: [{
@@ -93,7 +90,6 @@ ruleTester.run('no-will-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentWillUpdate'
     }]
@@ -122,7 +118,6 @@ ruleTester.run('no-will-update-set-state', rule, {
       '});'
     ].join('\n'),
     options: ['disallow-in-func'],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentWillUpdate'
     }]
@@ -153,7 +148,6 @@ ruleTester.run('no-will-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentWillUpdate'
@@ -187,7 +181,6 @@ ruleTester.run('no-will-update-set-state', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Do not use setState in componentWillUpdate'
     }]
@@ -216,7 +209,6 @@ ruleTester.run('no-will-update-set-state', rule, {
       '});'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     options: ['disallow-in-func'],
     errors: [{
       message: 'Do not use setState in componentWillUpdate'
diff --git a/tests/lib/rules/prefer-es6-class.js b/tests/lib/rules/prefer-es6-class.js
index acb0e34a6e..1f39cdeb4e 100644
--- a/tests/lib/rules/prefer-es6-class.js
+++ b/tests/lib/rules/prefer-es6-class.js
@@ -12,9 +12,10 @@ var rule = require('../../../lib/rules/prefer-es6-class');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
   sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -25,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('prefer-es6-class', rule, {
 
   valid: [{
@@ -36,8 +37,7 @@ ruleTester.run('prefer-es6-class', rule, {
       '  }',
       '}',
       'Hello.displayName = \'Hello\''
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'export default class Hello extends React.Component {',
@@ -46,14 +46,12 @@ ruleTester.run('prefer-es6-class', rule, {
       '  }',
       '}',
       'Hello.displayName = \'Hello\''
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = "foo";',
       'module.exports = {};'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var Hello = createReactClass({',
@@ -62,8 +60,7 @@ ruleTester.run('prefer-es6-class', rule, {
       '  }',
       '});'
     ].join('\n'),
-    options: ['never'],
-    parserOptions: parserOptions
+    options: ['never']
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -72,8 +69,7 @@ ruleTester.run('prefer-es6-class', rule, {
       '  }',
       '}'
     ].join('\n'),
-    options: ['always'],
-    parserOptions: parserOptions
+    options: ['always']
   }],
 
   invalid: [{
@@ -85,7 +81,6 @@ ruleTester.run('prefer-es6-class', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component should use es6 class instead of createClass'
     }]
@@ -98,7 +93,6 @@ ruleTester.run('prefer-es6-class', rule, {
       '});'
     ].join('\n'),
     options: ['always'],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component should use es6 class instead of createClass'
     }]
@@ -111,7 +105,6 @@ ruleTester.run('prefer-es6-class', rule, {
       '}'
     ].join('\n'),
     options: ['never'],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Component should use createClass instead of es6 class'
     }]
diff --git a/tests/lib/rules/prefer-stateless-function.js b/tests/lib/rules/prefer-stateless-function.js
index f1e8cde011..edf32e1673 100644
--- a/tests/lib/rules/prefer-stateless-function.js
+++ b/tests/lib/rules/prefer-stateless-function.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/prefer-stateless-function');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,7 +24,7 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('prefer-stateless-function', rule, {
 
   valid: [
@@ -32,12 +34,10 @@ ruleTester.run('prefer-stateless-function', rule, {
         'const Foo = function(props) {',
         '  return <div>{props.foo}</div>;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Already a stateless (arrow) function
-      code: 'const Foo = ({foo}) => <div>{foo}</div>;',
-      parserOptions: parserOptions
+      code: 'const Foo = ({foo}) => <div>{foo}</div>;'
     }, {
       // Extends from PureComponent and uses props
       code: [
@@ -47,7 +47,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{
         ignorePureComponents: true
       }]
@@ -60,7 +59,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{
         ignorePureComponents: true
       }]
@@ -75,8 +73,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Has a state
       code: [
@@ -88,8 +85,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div onClick={this.changeState.bind(this)}>{this.state.foo || "bar"}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Use refs
       code: [
@@ -101,8 +97,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div ref="foo" onClick={this.doStuff}>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Has an additional method
       code: [
@@ -112,8 +107,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Has an empty (no super) constructor
       code: [
@@ -123,8 +117,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Has a constructor
       code: [
@@ -136,8 +129,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Has a constructor (2)
       code: [
@@ -149,8 +141,7 @@ ruleTester.run('prefer-stateless-function', rule, {
         '    return <div>{this.props.foo}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Use this.bar
       code: [
@@ -222,7 +213,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       settings: {
         react: {
           version: '0.14.0'
@@ -315,7 +305,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: 'Component should be written as a pure function'
       }]
@@ -328,7 +317,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: 'Component should be written as a pure function'
       }]
@@ -341,7 +329,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       options: [{
         ignorePureComponents: true
       }],
@@ -357,7 +344,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: 'Component should be written as a pure function'
       }]
@@ -467,7 +453,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: 'Component should be written as a pure function'
       }]
@@ -499,7 +484,6 @@ ruleTester.run('prefer-stateless-function', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: 'Component should be written as a pure function'
       }]
diff --git a/tests/lib/rules/prop-types.js b/tests/lib/rules/prop-types.js
index 251dea4163..772d955930 100644
--- a/tests/lib/rules/prop-types.js
+++ b/tests/lib/rules/prop-types.js
@@ -12,7 +12,8 @@ var rule = require('../../../lib/rules/prop-types');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -31,7 +32,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('prop-types', rule, {
 
   valid: [
@@ -45,8 +46,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -57,8 +57,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {this.props.name.firstname}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -66,8 +65,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -78,8 +76,7 @@ ruleTester.run('prop-types', rule, {
       ].join('\n'),
       options: [{
         ignore: ['children']
-      }],
-      parserOptions: parserOptions
+      }]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -88,8 +85,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -98,8 +94,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello World {this.props[propName]}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -108,8 +103,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -118,8 +112,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -127,8 +120,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -140,8 +132,7 @@ ruleTester.run('prop-types', rule, {
         '  firstname: PropTypes.string',
         '};',
         'Hello.propTypes.lastname = PropTypes.string;'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -155,8 +146,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {user.name}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello {',
@@ -164,16 +154,14 @@ ruleTester.run('prop-types', rule, {
         '    return \'Hello\' + this.props.name;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello {',
         '  method;',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -186,8 +174,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {this.props.name}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -200,8 +187,7 @@ ruleTester.run('prop-types', rule, {
         '  firstname: PropTypes.string',
         '};'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -210,8 +196,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello {firstname}</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -223,8 +208,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -235,8 +219,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  \'firstname\': PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -250,8 +233,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  \'firstname\': PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -264,8 +246,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes.a = PropTypes.shape({',
         '  b: PropTypes.string',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -281,8 +262,7 @@ ruleTester.run('prop-types', rule, {
         '  })',
         '};',
         'Hello.propTypes.a.b.c = PropTypes.number;'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -302,8 +282,7 @@ ruleTester.run('prop-types', rule, {
         '    })',
         '  )',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -325,8 +304,7 @@ ruleTester.run('prop-types', rule, {
         '    })',
         '  )',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -341,8 +319,7 @@ ruleTester.run('prop-types', rule, {
         '    PropTypes.string',
         '  ])',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -365,8 +342,7 @@ ruleTester.run('prop-types', rule, {
         '    )',
         '  ])',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -379,8 +355,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  a: PropTypes.instanceOf(Hello)',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -407,8 +382,7 @@ ruleTester.run('prop-types', rule, {
         '  numb: PropTypes.number,',
         '  stri: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -437,8 +411,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  "some.value": PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -450,8 +423,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  "arr": PropTypes.array',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -465,8 +437,7 @@ ruleTester.run('prop-types', rule, {
         '    PropTypes.shape({"some.value": PropTypes.string})',
         '  )',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var TestComp1 = createReactClass({',
@@ -481,8 +452,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>{icons}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -530,8 +500,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>{nextPath}</div>;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -543,8 +512,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -558,8 +526,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -573,8 +540,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -588,8 +554,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -601,8 +566,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{customValidators: ['CustomValidator']}],
-      parserOptions: parserOptions
+      options: [{customValidators: ['CustomValidator']}]
     }, {
       code: [
         'class Comp1 extends Component {',
@@ -639,8 +603,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div />;',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -649,8 +612,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello World</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -663,8 +625,7 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '  users: PropTypes.arrayOf(PropTypes.object)',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -673,8 +634,7 @@ ruleTester.run('prop-types', rule, {
         '    return <div>Hello</div>;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -831,8 +791,7 @@ ruleTester.run('prop-types', rule, {
         '    );',
         '  }',
         '});'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = (props) => {',
@@ -844,8 +803,7 @@ ruleTester.run('prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = ({ someProp }) => {',
@@ -857,8 +815,7 @@ ruleTester.run('prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const statelessComponent = function({ someProp }) {',
@@ -870,8 +827,7 @@ ruleTester.run('prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function statelessComponent({ someProp }) {',
@@ -883,29 +839,25 @@ ruleTester.run('prop-types', rule, {
         'statelessComponent.propTypes = {',
         '  someProp: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function notAComponent({ something }) {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const notAComponent = function({ something }) {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'const notAComponent = ({ something }) => {',
         '  return something + 1;',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Validation is ignored on reassigned props object
       code: [
@@ -1106,8 +1058,7 @@ ruleTester.run('prop-types', rule, {
         '    ...otherPropTypes,',
         '    firstName: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Ignore destructured function arguments
       code: [
@@ -1116,8 +1067,7 @@ ruleTester.run('prop-types', rule, {
         '    return ["string"].map(({length}) => <div>{length}</div>);',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       // Flow annotations on stateless components
       code: [
@@ -1167,8 +1117,7 @@ ruleTester.run('prop-types', rule, {
         '    <div/>',
         '  )',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function JobList(props) {',
@@ -1230,8 +1179,7 @@ ruleTester.run('prop-types', rule, {
         '  const {...rest} = props;',
         '  return <div>Hello</div>;',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'let Greetings = class extends React.Component {',
@@ -1242,8 +1190,7 @@ ruleTester.run('prop-types', rule, {
         'Greetings.propTypes = {',
         '  name: PropTypes.string',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'let Greetings = {',
@@ -1256,8 +1203,7 @@ ruleTester.run('prop-types', rule, {
         'Greetings.Hello.propTypes = {',
         '  name: PropTypes.string',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'let Greetings = {};',
@@ -1269,8 +1215,7 @@ ruleTester.run('prop-types', rule, {
         'Greetings.Hello.propTypes = {',
         '  name: PropTypes.string',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }, {
       code: [
         'function Hello({names}) {',
@@ -1313,8 +1258,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{skipUndeclared: true}],
-      parserOptions: parserOptions
+      options: [{skipUndeclared: true}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -1323,8 +1267,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{skipUndeclared: true}],
-      parserOptions: parserOptions
+      options: [{skipUndeclared: true}]
     }, {
       code: [
         'class Hello extends React.Component {',
@@ -1333,8 +1276,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      options: [{skipUndeclared: true}],
-      parserOptions: parserOptions
+      options: [{skipUndeclared: true}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -1346,8 +1288,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{skipUndeclared: true}],
-      parserOptions: parserOptions
+      options: [{skipUndeclared: true}]
     }, {
       code: [
         'var Hello = createReactClass({',
@@ -1359,8 +1300,7 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      options: [{skipUndeclared: false}],
-      parserOptions: parserOptions
+      options: [{skipUndeclared: false}]
     }, {
       // Async functions can't be components.
       code: [
@@ -1408,13 +1348,7 @@ ruleTester.run('prop-types', rule, {
         '    return <Greeting onSelect={this.onSelect} />;',
         '  }',
         '}'
-      ].join('\n'),
-      parserOptions: {
-        ecmaVersion: 8,
-        ecmaFeatures: {
-          jsx: true
-        }
-      }
+      ].join('\n')
     }, {
       code: [
         'export class Example extends Component {',
@@ -1454,9 +1388,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      ecmaFeatures: {
-        jsx: false
-      },
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 3,
@@ -1471,7 +1402,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 3,
@@ -1486,7 +1416,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 3,
@@ -1502,7 +1431,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 4,
@@ -1520,7 +1448,6 @@ ruleTester.run('prop-types', rule, {
         '  firstname: PropTypes.string',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'lastname\' is missing in props validation'
       }]
@@ -1540,7 +1467,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation'
       }]
@@ -1560,7 +1486,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '});'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'propWithoutTypeDefinition\' is missing in props validation'
       }, {
@@ -1578,7 +1503,6 @@ ruleTester.run('prop-types', rule, {
         '  firstname: PropTypes.string',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'lastname\' is missing in props validation'
       }]
@@ -1594,7 +1518,6 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       parser: 'babel-eslint',
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation'
       }]
@@ -1611,7 +1534,6 @@ ruleTester.run('prop-types', rule, {
         '  })',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'a.b\' is missing in props validation'
       }]
@@ -1630,7 +1552,6 @@ ruleTester.run('prop-types', rule, {
         '  })',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'a.b.c\' is missing in props validation'
       }]
@@ -1651,7 +1572,6 @@ ruleTester.run('prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'a.b.c\' is missing in props validation'},
         {message: '\'a.__.d\' is missing in props validation'},
@@ -1677,7 +1597,6 @@ ruleTester.run('prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'a[].c\' is missing in props validation'},
         {message: '\'a[].d\' is missing in props validation'},
@@ -1706,7 +1625,6 @@ ruleTester.run('prop-types', rule, {
         '  ])',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'a.length\' is missing in props validation'},
         {message: '\'a.b\' is missing in props validation'}
@@ -1741,7 +1659,6 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'some.value\' is missing in props validation'}
       ]
@@ -1756,7 +1673,6 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'arr\' is missing in props validation'}
       ]
@@ -1774,7 +1690,6 @@ ruleTester.run('prop-types', rule, {
         '  )',
         '};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'arr[].some.value\' is missing in props validation'}
       ]
@@ -2271,7 +2186,6 @@ ruleTester.run('prop-types', rule, {
         '}',
         'Greetings.propTypes = {};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation'
       }]
@@ -2286,7 +2200,6 @@ ruleTester.run('prop-types', rule, {
         '}',
         'Greetings.Hello.propTypes = {};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation'
       }]
@@ -2300,7 +2213,6 @@ ruleTester.run('prop-types', rule, {
         '}',
         'Greetings.Hello.propTypes = {};'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation'
       }]
@@ -2311,7 +2223,6 @@ ruleTester.run('prop-types', rule, {
         '  return <Hello>{names}</Hello>;',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'names\' is missing in props validation'
       }]
@@ -2321,7 +2232,6 @@ ruleTester.run('prop-types', rule, {
         '  <div onClick={() => props.toggle()}></div>',
         ')'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'toggle\' is missing in props validation'
       }]
@@ -2329,7 +2239,6 @@ ruleTester.run('prop-types', rule, {
       code: [
         'const MyComponent = props => props.test ? <div /> : <span />'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'test\' is missing in props validation'
       }]
@@ -2341,7 +2250,6 @@ ruleTester.run('prop-types', rule, {
         '  otherProp: props.otherProp,',
         '})'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'test\' is missing in props validation'
       }]
@@ -2399,7 +2307,6 @@ ruleTester.run('prop-types', rule, {
         '  return <div className={f()}>{bar}</div>;',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'bar\' is missing in props validation'}
       ]
@@ -2411,7 +2318,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 3,
@@ -2426,7 +2332,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [{
         message: '\'name\' is missing in props validation',
         line: 3,
@@ -2459,7 +2364,6 @@ ruleTester.run('prop-types', rule, {
         '});'
       ].join('\n'),
       options: [{skipUndeclared: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation',
         line: 4,
@@ -2473,7 +2377,6 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {}'
       ].join('\n'),
       options: [{skipUndeclared: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation',
         line: 2,
@@ -2491,7 +2394,6 @@ ruleTester.run('prop-types', rule, {
         '}'
       ].join('\n'),
       options: [{skipUndeclared: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation',
         line: 6,
@@ -2507,7 +2409,6 @@ ruleTester.run('prop-types', rule, {
         'Hello.propTypes = {};'
       ].join('\n'),
       options: [{skipUndeclared: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation',
         line: 3,
@@ -2522,7 +2423,6 @@ ruleTester.run('prop-types', rule, {
         '});'
       ].join('\n'),
       options: [{skipUndeclared: false}],
-      parserOptions: parserOptions,
       errors: [{
         message: '\'firstname\' is missing in props validation',
         line: 3,
@@ -2643,7 +2543,6 @@ ruleTester.run('prop-types', rule, {
         '  }',
         '}'
       ].join('\n'),
-      parserOptions: parserOptions,
       errors: [
         {message: '\'name\' is missing in props validation'}
       ]
diff --git a/tests/lib/rules/react-in-jsx-scope.js b/tests/lib/rules/react-in-jsx-scope.js
index bc370033a4..8e8d97ffa1 100644
--- a/tests/lib/rules/react-in-jsx-scope.js
+++ b/tests/lib/rules/react-in-jsx-scope.js
@@ -13,9 +13,10 @@ var rule = require('../../../lib/rules/react-in-jsx-scope');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
   sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -30,17 +31,17 @@ var settings = {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('react-in-jsx-scope', rule, {
   valid: [
-    {code: 'var React, App; <App />;', parserOptions: parserOptions},
-    {code: 'var React; <img />;', parserOptions: parserOptions},
-    {code: 'var React; <x-gif />;', parserOptions: parserOptions},
-    {code: 'var React, App, a=1; <App attr={a} />;', parserOptions: parserOptions},
-    {code: 'var React, App, a=1; function elem() { return <App attr={a} />; }', parserOptions: parserOptions},
-    {code: 'var React, App; <App />;', parserOptions: parserOptions},
-    {code: '/** @jsx Foo */ var Foo, App; <App />;', parserOptions: parserOptions},
-    {code: '/** @jsx Foo.Bar */ var Foo, App; <App />;', parserOptions: parserOptions},
+    {code: 'var React, App; <App />;'},
+    {code: 'var React; <img />;'},
+    {code: 'var React; <x-gif />;'},
+    {code: 'var React, App, a=1; <App attr={a} />;'},
+    {code: 'var React, App, a=1; function elem() { return <App attr={a} />; }'},
+    {code: 'var React, App; <App />;'},
+    {code: '/** @jsx Foo */ var Foo, App; <App />;'},
+    {code: '/** @jsx Foo.Bar */ var Foo, App; <App />;'},
     {code: [
       'import React from \'react/addons\';',
       'const Button = createReactClass({',
@@ -51,26 +52,26 @@ ruleTester.run('react-in-jsx-scope', rule, {
       '  }',
       '});',
       'export default Button;'
-    ].join('\n'), parserOptions: parserOptions},
-    {code: 'var Foo, App; <App />;', settings: settings, parserOptions: parserOptions}
+    ].join('\n')},
+    {code: 'var Foo, App; <App />;', settings: settings}
   ],
   invalid: [{
     code: 'var App, a = <App />;',
-    errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' must be in scope when using JSX'}]
   }, {
     code: 'var a = <App />;',
-    errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' must be in scope when using JSX'}]
   }, {
     code: 'var a = <img />;',
-    errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' must be in scope when using JSX'}]
   }, {
     code: '/** @jsx React.DOM */ var a = <img />;',
-    errors: [{message: '\'React\' must be in scope when using JSX'}], parserOptions: parserOptions
+    errors: [{message: '\'React\' must be in scope when using JSX'}]
   }, {
     code: '/** @jsx Foo.bar */ var React, a = <img />;',
-    errors: [{message: '\'Foo\' must be in scope when using JSX'}], parserOptions: parserOptions
+    errors: [{message: '\'Foo\' must be in scope when using JSX'}]
   }, {
     code: 'var React, a = <img />;',
-    errors: [{message: '\'Foo\' must be in scope when using JSX'}], settings: settings, parserOptions: parserOptions
+    errors: [{message: '\'Foo\' must be in scope when using JSX'}], settings: settings
   }]
 });
diff --git a/tests/lib/rules/require-default-props.js b/tests/lib/rules/require-default-props.js
index 58cc74b7a3..c3c9f6db6a 100644
--- a/tests/lib/rules/require-default-props.js
+++ b/tests/lib/rules/require-default-props.js
@@ -11,17 +11,18 @@
 var rule = require('../../../lib/rules/require-default-props');
 var RuleTester = require('eslint').RuleTester;
 
-require('babel-eslint');
-
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
   }
 };
 
-var ruleTester = new RuleTester({parserOptions: parserOptions});
+require('babel-eslint');
+
+var ruleTester = new RuleTester({parserOptions});
 
 // ------------------------------------------------------------------------------
 // Tests
diff --git a/tests/lib/rules/require-optimization.js b/tests/lib/rules/require-optimization.js
index 0a1d4a590b..49fad7e6fa 100644
--- a/tests/lib/rules/require-optimization.js
+++ b/tests/lib/rules/require-optimization.js
@@ -8,35 +8,36 @@ var rule = require('../../../lib/rules/require-optimization');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
-  sourceType: 'module'
+  ecmaVersion: 8,
+  sourceType: 'module',
+  ecmaFeatures: {
+    experimentalObjectRestSpread: true,
+    jsx: true
+  }
 };
 
 var MESSAGE = 'Component is not optimized. Please add a shouldComponentUpdate method.';
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('react-require-optimization', rule, {
   valid: [{
     code: [
       'class A {}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'import React from "react";' +
       'class YourComponent extends React.Component {' +
       'shouldComponentUpdate () {}' +
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'import React, {Component} from "react";' +
       'class YourComponent extends Component {' +
       'shouldComponentUpdate () {}' +
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'import React, {Component} from "react";',
@@ -46,56 +47,49 @@ ruleTester.run('react-require-optimization', rule, {
       '  render() {}',
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'import React from "react";' +
       'createReactClass({' +
       'shouldComponentUpdate: function () {}' +
       '})'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'import React from "react";' +
       'createReactClass({' +
       'mixins: [PureRenderMixin]' +
       '})'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       '@reactMixin.decorate(PureRenderMixin)',
       'class DecoratedComponent extends Component {' +
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'const FunctionalComponent = function (props) {' +
       'return <div />;' +
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'function FunctionalComponent(props) {' +
       'return <div />;' +
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'const FunctionalComponent = (props) => {' +
       'return <div />;' +
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       '@bar',
@@ -105,24 +99,21 @@ ruleTester.run('react-require-optimization', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    options: [{allowDecorators: ['renderPure', 'pureRender']}],
-    parserOptions: parserOptions
+    options: [{allowDecorators: ['renderPure', 'pureRender']}]
   }, {
     code: [
       'import React from "react";' +
       'class YourComponent extends React.PureComponent {}'
     ].join('\n'),
     parser: 'babel-eslint',
-    options: [{allowDecorators: ['renderPure', 'pureRender']}],
-    parserOptions: parserOptions
+    options: [{allowDecorators: ['renderPure', 'pureRender']}]
   }, {
     code: [
       'import React, {PureComponent} from "react";' +
       'class YourComponent extends PureComponent {}'
     ].join('\n'),
     parser: 'babel-eslint',
-    options: [{allowDecorators: ['renderPure', 'pureRender']}],
-    parserOptions: parserOptions
+    options: [{allowDecorators: ['renderPure', 'pureRender']}]
   }],
 
   invalid: [{
@@ -132,8 +123,7 @@ ruleTester.run('react-require-optimization', rule, {
     ].join('\n'),
     errors: [{
       message: MESSAGE
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'import React from "react";',
@@ -147,8 +137,7 @@ ruleTester.run('react-require-optimization', rule, {
     parser: 'babel-eslint',
     errors: [{
       message: MESSAGE
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'import React, {Component} from "react";' +
@@ -156,8 +145,7 @@ ruleTester.run('react-require-optimization', rule, {
     ].join('\n'),
     errors: [{
       message: MESSAGE
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'import React from "react";' +
@@ -166,8 +154,7 @@ ruleTester.run('react-require-optimization', rule, {
     ].join('\n'),
     errors: [{
       message: MESSAGE
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'import React from "react";' +
@@ -177,8 +164,7 @@ ruleTester.run('react-require-optimization', rule, {
     ].join('\n'),
     errors: [{
       message: MESSAGE
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       '@reactMixin.decorate(SomeOtherMixin)',
@@ -188,8 +174,7 @@ ruleTester.run('react-require-optimization', rule, {
     errors: [{
       message: MESSAGE
     }],
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       '@bar',
@@ -202,7 +187,6 @@ ruleTester.run('react-require-optimization', rule, {
       message: MESSAGE
     }],
     parser: 'babel-eslint',
-    options: [{allowDecorators: ['renderPure', 'pureRender']}],
-    parserOptions: parserOptions
+    options: [{allowDecorators: ['renderPure', 'pureRender']}]
   }]
 });
diff --git a/tests/lib/rules/require-render-return.js b/tests/lib/rules/require-render-return.js
index 9ec3252b83..be4d374450 100644
--- a/tests/lib/rules/require-render-return.js
+++ b/tests/lib/rules/require-render-return.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/require-render-return');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('require-render-return', rule, {
 
   valid: [{
@@ -35,8 +37,7 @@ ruleTester.run('require-render-return', rule, {
       '    return <div>Hello {this.props.name}</div>;',
       '  }',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // ES6 class with render property
     code: [
@@ -46,8 +47,7 @@ ruleTester.run('require-render-return', rule, {
       '  }',
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     // ES6 class with render property (implicit return)
     code: [
@@ -57,8 +57,7 @@ ruleTester.run('require-render-return', rule, {
       '  )',
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     // ES5 class
     code: [
@@ -68,16 +67,14 @@ ruleTester.run('require-render-return', rule, {
       '    return <div></div>',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Stateless function
     code: [
       'function Hello() {',
       '  return <div></div>;',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Stateless arrow function
     code: [
@@ -85,8 +82,7 @@ ruleTester.run('require-render-return', rule, {
       '  <div></div>',
       ');'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     // Return in a switch...case
     code: [
@@ -100,8 +96,7 @@ ruleTester.run('require-render-return', rule, {
       '    }',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Return in a if...else
     code: [
@@ -114,24 +109,20 @@ ruleTester.run('require-render-return', rule, {
       '    }',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Not a React component
     code: [
       'class Hello {',
       '  render() {}',
       '}'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // ES6 class without a render method
-    code: 'class Hello extends React.Component {}',
-    parserOptions: parserOptions
+    code: 'class Hello extends React.Component {}'
   }, {
     // ES5 class without a render method
-    code: 'var Hello = createReactClass({});',
-    parserOptions: parserOptions
+    code: 'var Hello = createReactClass({});'
   }, {
     // ES5 class with an imported render method
     code: [
@@ -139,8 +130,7 @@ ruleTester.run('require-render-return', rule, {
       'var Hello = createReactClass({',
       '  render',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Invalid render method (but accepted by Babel)
     code: [
@@ -159,7 +149,6 @@ ruleTester.run('require-render-return', rule, {
       '  render: function() {}',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Your render method should have return statement'
     }]
@@ -170,7 +159,6 @@ ruleTester.run('require-render-return', rule, {
       '  render() {} ',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Your render method should have return statement'
     }]
@@ -185,7 +173,6 @@ ruleTester.run('require-render-return', rule, {
       '  } ',
       '}'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: 'Your render method should have return statement'
     }]
@@ -199,7 +186,6 @@ ruleTester.run('require-render-return', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: [{
       message: 'Your render method should have return statement'
     }]
diff --git a/tests/lib/rules/self-closing-comp.js b/tests/lib/rules/self-closing-comp.js
index 13a091ce85..80082b7a40 100644
--- a/tests/lib/rules/self-closing-comp.js
+++ b/tests/lib/rules/self-closing-comp.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/self-closing-comp');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -22,88 +24,70 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('self-closing-comp', rule, {
 
   valid: [
     {
-      code: 'var HelloJohn = <Hello name="John" />;',
-      parserOptions: parserOptions
+      code: 'var HelloJohn = <Hello name="John" />;'
     }, {
-      code: 'var Profile = <Hello name="John"><img src="picture.png" /></Hello>;',
-      parserOptions: parserOptions
+      code: 'var Profile = <Hello name="John"><img src="picture.png" /></Hello>;'
     }, {
       code: `
         <Hello>
           <Hello name="John" />
         </Hello>
-      `,
-      parserOptions: parserOptions
+      `
     }, {
-      code: 'var HelloJohn = <div>&nbsp;</div>;',
-      parserOptions: parserOptions
+      code: 'var HelloJohn = <div>&nbsp;</div>;'
     }, {
-      code: 'var HelloJohn = <div>{\' \'}</div>;',
-      parserOptions: parserOptions
+      code: 'var HelloJohn = <div>{\' \'}</div>;'
     }, {
-      code: 'var HelloJohn = <Hello name="John">&nbsp;</Hello>;',
-      parserOptions: parserOptions
+      code: 'var HelloJohn = <Hello name="John">&nbsp;</Hello>;'
     }, {
       code: 'var HelloJohn = <Hello name="John" />;',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: 'var Profile = <Hello name="John"><img src="picture.png" /></Hello>;',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: `
         <Hello>
           <Hello name="John" />
         </Hello>
       `,
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: 'var HelloJohn = <div>&nbsp;</div>;',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: 'var HelloJohn = <div>{\' \'}</div>;',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: 'var HelloJohn = <Hello name="John">&nbsp;</Hello>;',
-      options: [],
-      parserOptions: parserOptions
+      options: []
     }, {
       code: 'var HelloJohn = <Hello name="John"></Hello>;',
-      options: [{component: false}],
-      parserOptions: parserOptions
+      options: [{component: false}]
     }, {
       code: 'var HelloJohn = <Hello name="John">\n</Hello>;',
-      options: [{component: false}],
-      parserOptions: parserOptions
+      options: [{component: false}]
     }, {
       code: 'var HelloJohn = <Hello name="John"> </Hello>;',
-      options: [{component: false}],
-      parserOptions: parserOptions
+      options: [{component: false}]
     }, {
       code: 'var contentContainer = <div className="content" />;',
-      options: [{html: true}],
-      parserOptions: parserOptions
+      options: [{html: true}]
     }, {
       code: 'var contentContainer = <div className="content"><img src="picture.png" /></div>;',
-      options: [{html: true}],
-      parserOptions: parserOptions
+      options: [{html: true}]
     }, {
       code: `
         <div>
           <div className="content" />
         </div>
       `,
-      options: [{html: true}],
-      parserOptions: parserOptions
+      options: [{html: true}]
     }
   ],
 
@@ -111,7 +95,6 @@ ruleTester.run('self-closing-comp', rule, {
     {
       code: 'var contentContainer = <div className="content"></div>;',
       output: 'var contentContainer = <div className="content" />;',
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -119,28 +102,24 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var contentContainer = <div className="content"></div>;',
       output: 'var contentContainer = <div className="content" />;',
       options: [],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
     }, {
       code: 'var HelloJohn = <Hello name="John"></Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
     }, {
       code: 'var HelloJohn = <Hello name="John">\n</Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
     }, {
       code: 'var HelloJohn = <Hello name="John"> </Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -149,7 +128,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var HelloJohn = <Hello name="John"></Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
       options: [],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -157,7 +135,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var HelloJohn = <Hello name="John">\n</Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
       options: [],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -165,7 +142,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var HelloJohn = <Hello name="John"> </Hello>;',
       output: 'var HelloJohn = <Hello name="John" />;',
       options: [],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -173,7 +149,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var contentContainer = <div className="content"></div>;',
       output: 'var contentContainer = <div className="content" />;',
       options: [{html: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -181,7 +156,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var contentContainer = <div className="content">\n</div>;',
       output: 'var contentContainer = <div className="content" />;',
       options: [{html: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
@@ -189,7 +163,6 @@ ruleTester.run('self-closing-comp', rule, {
       code: 'var contentContainer = <div className="content"> </div>;',
       output: 'var contentContainer = <div className="content" />;',
       options: [{html: true}],
-      parserOptions: parserOptions,
       errors: [{
         message: 'Empty components are self-closing'
       }]
diff --git a/tests/lib/rules/sort-comp.js b/tests/lib/rules/sort-comp.js
index e93352a3a1..b4fe1a306f 100644
--- a/tests/lib/rules/sort-comp.js
+++ b/tests/lib/rules/sort-comp.js
@@ -12,8 +12,10 @@ var rule = require('../../../lib/rules/sort-comp');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
+    experimentalObjectRestSpread: true,
     jsx: true
   }
 };
@@ -24,7 +26,7 @@ require('babel-eslint');
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('sort-comp', rule, {
 
   valid: [{
@@ -51,8 +53,7 @@ ruleTester.run('sort-comp', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Must validate a class with missing groups
     code: [
@@ -61,8 +62,7 @@ ruleTester.run('sort-comp', rule, {
       '    return <div>Hello</div>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Must put a custom method in 'everything-else'
     code: [
@@ -72,8 +72,7 @@ ruleTester.run('sort-comp', rule, {
       '    return <button onClick={this.onClick}>Hello</button>;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     // Must allow us to re-order the groups
     code: [
@@ -91,8 +90,7 @@ ruleTester.run('sort-comp', rule, {
         'render',
         'everything-else'
       ]
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     // Must allow us to create a RegExp-based group
     code: [
@@ -111,8 +109,7 @@ ruleTester.run('sort-comp', rule, {
         'render',
         '/on.*/'
       ]
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     // Must allow us to create a named group
     code: [
@@ -136,8 +133,7 @@ ruleTester.run('sort-comp', rule, {
           '/on.*/'
         ]
       }
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     // Must allow a method to be in different places if it's matches multiple patterns
     code: [
@@ -154,8 +150,7 @@ ruleTester.run('sort-comp', rule, {
         'render',
         '/.*Click/'
       ]
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     // Must allow us to use 'constructor' as a method name
     code: [
@@ -174,8 +169,7 @@ ruleTester.run('sort-comp', rule, {
         'everything-else',
         'render'
       ]
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     // Must ignore stateless components
     code: [
@@ -215,7 +209,6 @@ ruleTester.run('sort-comp', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     options: [{
       order: [
         'type-annotations',
@@ -238,7 +231,6 @@ ruleTester.run('sort-comp', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     options: [{
       order: [
         'type-annotations',
@@ -260,7 +252,6 @@ ruleTester.run('sort-comp', rule, {
       '  displayName : \'Hello\',',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'render should be placed after displayName'}]
   }, {
     // Must run rule when render uses createElement instead of JSX
@@ -272,7 +263,6 @@ ruleTester.run('sort-comp', rule, {
       '  displayName : \'Hello\',',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'render should be placed after displayName'}]
   }, {
     // Must force a custom method to be placed before render
@@ -284,7 +274,6 @@ ruleTester.run('sort-comp', rule, {
       '  onClick: function() {},',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{message: 'render should be placed after onClick'}]
   }, {
     // Must force a custom method to be placed after render if no 'everything-else' group is specified
@@ -303,7 +292,6 @@ ruleTester.run('sort-comp', rule, {
         'render'
       ]
     }],
-    parserOptions: parserOptions,
     errors: [{message: 'onClick should be placed after render'}]
   }, {
     // Must validate static properties
@@ -316,7 +304,6 @@ ruleTester.run('sort-comp', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: [{message: 'render should be placed after displayName'}]
   }, {
     // Type Annotations should not be at the top by default
@@ -331,7 +318,6 @@ ruleTester.run('sort-comp', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: [{message: 'props should be placed after state'}]
   }, {
     // Type Annotations should be first
diff --git a/tests/lib/rules/sort-prop-types.js b/tests/lib/rules/sort-prop-types.js
index bdaf780a53..cd8996bbd6 100644
--- a/tests/lib/rules/sort-prop-types.js
+++ b/tests/lib/rules/sort-prop-types.js
@@ -11,7 +11,8 @@ var rule = require('../../../lib/rules/sort-prop-types');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -26,7 +27,7 @@ require('babel-eslint');
 
 var ERROR_MESSAGE = 'Prop types declarations should be sorted alphabetically';
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('sort-prop-types', rule, {
 
   valid: [{
@@ -36,8 +37,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -46,8 +46,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -61,8 +60,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -79,8 +77,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       ignoreCase: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'var First = createReactClass({',
@@ -101,8 +98,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class First extends React.Component {',
@@ -115,8 +111,7 @@ ruleTester.run('sort-prop-types', rule, {
       '  z: PropTypes.string',
       '};',
       'First.propTypes.justforcheck = PropTypes.string;'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'class First extends React.Component {',
@@ -133,8 +128,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       ignoreCase: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class Component extends React.Component {',
@@ -148,8 +142,7 @@ ruleTester.run('sort-prop-types', rule, {
       '  }',
       '}'
     ].join('\n'),
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'class Hello extends React.Component {',
@@ -189,8 +182,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -203,8 +195,7 @@ ruleTester.run('sort-prop-types', rule, {
       '    return <div />;',
       '  }',
       '});'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }, {
     code: [
       'var First = createReactClass({',
@@ -221,8 +212,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       callbacksLast: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class Component extends React.Component {',
@@ -240,8 +230,7 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       callbacksLast: true
     }],
-    parser: 'babel-eslint',
-    parserOptions: parserOptions
+    parser: 'babel-eslint'
   }, {
     code: [
       'class First extends React.Component {',
@@ -258,8 +247,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       callbacksLast: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class First extends React.Component {',
@@ -274,8 +262,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       requiredFirst: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class First extends React.Component {',
@@ -289,8 +276,7 @@ ruleTester.run('sort-prop-types', rule, {
     ].join('\n'),
     options: [{
       requiredFirst: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'class First extends React.Component {',
@@ -310,8 +296,7 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       requiredFirst: true,
       callbacksLast: true
-    }],
-    parserOptions: parserOptions
+    }]
   }, {
     code: [
       'export default class ClassWithSpreadInPropTypes extends BaseClass {',
@@ -330,8 +315,7 @@ ruleTester.run('sort-prop-types', rule, {
       '  return <div />;',
       '};',
       'TextFieldLabel.propTypes = propTypes;'
-    ].join('\n'),
-    parserOptions: parserOptions
+    ].join('\n')
   }],
 
   invalid: [{
@@ -346,7 +330,6 @@ ruleTester.run('sort-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 4,
@@ -365,7 +348,6 @@ ruleTester.run('sort-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 4,
@@ -387,7 +369,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       ignoreCase: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 4,
@@ -408,7 +389,6 @@ ruleTester.run('sort-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -431,7 +411,6 @@ ruleTester.run('sort-prop-types', rule, {
       '  }',
       '});'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -454,7 +433,6 @@ ruleTester.run('sort-prop-types', rule, {
       '    ZZ: PropTypes.string',
       '};'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -470,7 +448,6 @@ ruleTester.run('sort-prop-types', rule, {
       '}'
     ].join('\n'),
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: 2
   }, {
     code: [
@@ -489,7 +466,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       callbacksLast: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 6,
@@ -514,7 +490,6 @@ ruleTester.run('sort-prop-types', rule, {
       callbacksLast: true
     }],
     parser: 'babel-eslint',
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 6,
@@ -538,7 +513,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       callbacksLast: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 10,
@@ -562,7 +536,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       callbacksLast: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Callback prop types must be listed after all other prop types',
       line: 5,
@@ -585,7 +558,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       requiredFirst: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 4,
@@ -608,7 +580,6 @@ ruleTester.run('sort-prop-types', rule, {
     options: [{
       requiredFirst: true
     }],
-    parserOptions: parserOptions,
     errors: [{
       message: 'Required prop types must be listed before all other prop types',
       line: 4,
@@ -644,7 +615,6 @@ ruleTester.run('sort-prop-types', rule, {
       '};',
       'TextFieldLabel.propTypes = propTypes;'
     ].join('\n'),
-    parserOptions: parserOptions,
     errors: [{
       message: ERROR_MESSAGE,
       line: 3,
diff --git a/tests/lib/rules/style-prop-object.js b/tests/lib/rules/style-prop-object.js
index 7c7346c76a..880cd99a27 100644
--- a/tests/lib/rules/style-prop-object.js
+++ b/tests/lib/rules/style-prop-object.js
@@ -12,7 +12,8 @@ var rule = require('../../../lib/rules/style-prop-object');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -23,16 +24,14 @@ var parserOptions = {
 // Tests
 // ------------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('style-prop-object', rule, {
   valid: [
     {
-      code: '<div style={{ color: "red" }} />',
-      parserOptions: parserOptions
+      code: '<div style={{ color: "red" }} />'
     },
     {
-      code: '<Hello style={{ color: "red" }} />',
-      parserOptions: parserOptions
+      code: '<Hello style={{ color: "red" }} />'
     },
     {
       code: [
@@ -40,8 +39,7 @@ ruleTester.run('style-prop-object', rule, {
         '  const styles = { color: "red" };',
         '  return <div style={styles} />;',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -49,8 +47,7 @@ ruleTester.run('style-prop-object', rule, {
         '  const styles = { color: "red" };',
         '  return <Hello style={styles} />;',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -58,16 +55,14 @@ ruleTester.run('style-prop-object', rule, {
         'function redDiv() {',
         '  return <div style={styles} />;',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'function redDiv(props) {',
         '  return <div style={props.styles} />;',
         '}'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -75,8 +70,7 @@ ruleTester.run('style-prop-object', rule, {
         'function redDiv() {',
         '  return <div style={styles} />;',
         '}'
-      ].join('\n'),
-      parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
+      ].join('\n')
     },
     {
       code: [
@@ -86,15 +80,21 @@ ruleTester.run('style-prop-object', rule, {
         '  return <div style={styles} />;',
         '}'
       ].join('\n'),
-      parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
+      parserOptions: {
+        ecmaVersion: 8,
+        sourceType: 'module',
+        ecmaFeatures: {
+          experimentalObjectRestSpread: true,
+          jsx: true
+        }
+      }
     },
     {
       code: [
         'const otherProps = { style: { color: "red" } };',
         'const { a, b, ...props } = otherProps;',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -104,64 +104,55 @@ ruleTester.run('style-prop-object', rule, {
       parserOptions: Object.assign({sourceType: 'module'}, parserOptions)
     },
     {
-      code: '<div style></div>',
-      parserOptions: parserOptions
+      code: '<div style></div>'
     },
     {
       code: [
         'React.createElement(MyCustomElem, {',
         '  [style]: true',
         '}, \'My custom Elem\')'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'let style;',
         '<div style={style}></div>'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'let style = null;',
         '<div style={style}></div>'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'let style = undefined;',
         '<div style={style}></div>'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
-      code: '<div style={undefined}></div>',
-      parserOptions: parserOptions
+      code: '<div style={undefined}></div>'
     },
     {
       code: [
         'const props = { style: undefined };',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'const otherProps = { style: undefined };',
         'const { a, b, ...props } = otherProps;',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'React.createElement("div", {',
         '  style: undefined',
         '})'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -169,35 +160,30 @@ ruleTester.run('style-prop-object', rule, {
         'React.createElement("div", {',
         '  style',
         '})'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
-      code: '<div style={null}></div>',
-      parserOptions: parserOptions
+      code: '<div style={null}></div>'
     },
     {
       code: [
         'const props = { style: null };',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'const otherProps = { style: null };',
         'const { a, b, ...props } = otherProps;',
         '<div {...props} />'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
         'React.createElement("div", {',
         '  style: null',
         '})'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     },
     {
       code: [
@@ -206,8 +192,7 @@ ruleTester.run('style-prop-object', rule, {
         '    ...props',
         '  });',
         '};'
-      ].join('\n'),
-      parserOptions: parserOptions
+      ].join('\n')
     }
   ],
   invalid: [
@@ -218,8 +203,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 1,
         column: 6,
         type: 'JSXAttribute'
-      }],
-      parserOptions: parserOptions
+      }]
     },
     {
       code: '<Hello style="color: \'red\'" />',
@@ -228,8 +212,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 1,
         column: 8,
         type: 'JSXAttribute'
-      }],
-      parserOptions: parserOptions
+      }]
     },
     {
       code: '<div style={true} />',
@@ -238,8 +221,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 1,
         column: 6,
         type: 'JSXAttribute'
-      }],
-      parserOptions: parserOptions
+      }]
     },
     {
       code: [
@@ -253,8 +235,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 3,
         column: 22,
         type: 'Identifier'
-      }],
-      parserOptions: parserOptions
+      }]
     },
     {
       code: [
@@ -268,8 +249,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 3,
         column: 24,
         type: 'Identifier'
-      }],
-      parserOptions: parserOptions
+      }]
     },
     {
       code: [
@@ -283,8 +263,7 @@ ruleTester.run('style-prop-object', rule, {
         line: 3,
         column: 22,
         type: 'Identifier'
-      }],
-      parserOptions: parserOptions
+      }]
     }
   ]
 });
diff --git a/tests/lib/rules/void-dom-elements-no-children.js b/tests/lib/rules/void-dom-elements-no-children.js
index 112cbf21a9..6704f41ede 100644
--- a/tests/lib/rules/void-dom-elements-no-children.js
+++ b/tests/lib/rules/void-dom-elements-no-children.js
@@ -13,7 +13,8 @@ var rule = require('../../../lib/rules/void-dom-elements-no-children');
 var RuleTester = require('eslint').RuleTester;
 
 var parserOptions = {
-  ecmaVersion: 6,
+  ecmaVersion: 8,
+  sourceType: 'module',
   ecmaFeatures: {
     experimentalObjectRestSpread: true,
     jsx: true
@@ -28,91 +29,74 @@ function errorMessage(elementName) {
 // Tests
 // -----------------------------------------------------------------------------
 
-var ruleTester = new RuleTester();
+var ruleTester = new RuleTester({parserOptions});
 ruleTester.run('void-dom-elements-no-children', rule, {
   valid: [
     {
-      code: '<div>Foo</div>;',
-      parserOptions: parserOptions
+      code: '<div>Foo</div>;'
     },
     {
-      code: '<div children="Foo" />;',
-      parserOptions: parserOptions
+      code: '<div children="Foo" />;'
     },
     {
-      code: '<div dangerouslySetInnerHTML={{ __html: "Foo" }} />;',
-      parserOptions: parserOptions
+      code: '<div dangerouslySetInnerHTML={{ __html: "Foo" }} />;'
     },
     {
-      code: 'React.createElement("div", {}, "Foo");',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", {}, "Foo");'
     },
     {
-      code: 'React.createElement("div", { children: "Foo" });',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", { children: "Foo" });'
     },
     {
-      code: 'React.createElement("div", { dangerouslySetInnerHTML: { __html: "Foo" } });',
-      parserOptions: parserOptions
+      code: 'React.createElement("div", { dangerouslySetInnerHTML: { __html: "Foo" } });'
     }, {
-      code: 'document.createElement("img")',
-      parserOptions: parserOptions
+      code: 'document.createElement("img")'
     }, {
-      code: 'React.createElement("img");',
-      parserOptions: parserOptions
+      code: 'React.createElement("img");'
     }, {
       code: [
         'import React from "react";',
         'const { createElement } = React;',
         'createElement("div")'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }, {
       code: [
         'import React from "react";',
         'const { createElement } = React;',
         'createElement("img")'
       ].join('\n'),
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }
   ],
   invalid: [
     {
       code: '<br>Foo</br>;',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: '<br children="Foo" />;',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: '<img {...props} children="Foo" />;',
-      errors: [{message: errorMessage('img')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('img')}]
     },
     {
       code: '<br dangerouslySetInnerHTML={{ __html: "Foo" }} />;',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: 'React.createElement("br", {}, "Foo");',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: 'React.createElement("br", { children: "Foo" });',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: 'React.createElement("br", { dangerouslySetInnerHTML: { __html: "Foo" } });',
-      errors: [{message: errorMessage('br')}],
-      parserOptions: parserOptions
+      errors: [{message: errorMessage('br')}]
     },
     {
       code: [
@@ -121,8 +105,7 @@ ruleTester.run('void-dom-elements-no-children', rule, {
         'createElement("img", {}, "Foo");'
       ].join('\n'),
       errors: [{message: errorMessage('img')}],
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -131,8 +114,7 @@ ruleTester.run('void-dom-elements-no-children', rule, {
         'createElement("img", { children: "Foo" });'
       ].join('\n'),
       errors: [{message: errorMessage('img')}],
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     },
     {
       code: [
@@ -141,8 +123,7 @@ ruleTester.run('void-dom-elements-no-children', rule, {
         'createElement("img", { dangerouslySetInnerHTML: { __html: "Foo" } });'
       ].join('\n'),
       errors: [{message: errorMessage('img')}],
-      parser: 'babel-eslint',
-      parserOptions: parserOptions
+      parser: 'babel-eslint'
     }
   ]
 });