diff --git a/.eslintrc.js b/.eslintrc.js
index 9cc7d1d024..fda855f401 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -43,6 +43,7 @@ module.exports = {
     'react/jsx-no-undef': ERROR,
     // We don't care to do this
     'react/jsx-sort-prop-types': OFF,
+    'react/jsx-space-before-closing': ERROR,
     'react/jsx-uses-react': ERROR,
     'react/no-is-mounted': OFF,
     // This isn't useful in our test code
diff --git a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
index 6f52435d82..858fb46fdf 100644
--- a/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
+++ b/src/addons/transitions/__tests__/ReactCSSTransitionGroup-test.js
@@ -283,8 +283,8 @@ describe('ReactCSSTransitionGroup', () => {
       }
     }
 
-    ReactDOM.render(<Component/>, container);
-    ReactDOM.render(<Component><span key="yolo" id="yolo"/></Component>, container);
+    ReactDOM.render(<Component />, container);
+    ReactDOM.render(<Component><span key="yolo" id="yolo" /></Component>, container);
 
     ReactDOM.unmountComponentAtNode(container);
 
@@ -322,7 +322,7 @@ describe('ReactCSSTransitionGroup', () => {
       }
     }
 
-    ReactDOM.render(<Component/>, container);
+    ReactDOM.render(<Component />, container);
 
     // Testing that no exception is thrown here, as the timeout has been cleared.
     jest.runAllTimers();
diff --git a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
index 14d1713917..248a5e08b2 100644
--- a/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
+++ b/src/addons/transitions/__tests__/ReactTransitionGroup-test.js
@@ -297,7 +297,7 @@ describe('ReactTransitionGroup', () => {
 
     class Component extends React.Component {
       render() {
-        var children = [<div key="1"/>, <div key="1" />];
+        var children = [<div key="1" />, <div key="1" />];
         return <ReactTransitionGroup>{children}</ReactTransitionGroup>;
       }
     }
diff --git a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
index a5a04430aa..4eab5185cb 100644
--- a/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
+++ b/src/isomorphic/classic/__tests__/ReactContextValidator-test.js
@@ -311,7 +311,7 @@ describe('ReactContextValidator', () => {
       }
     }
 
-    ReactTestUtils.renderIntoDocument(<ComponentA/>);
+    ReactTestUtils.renderIntoDocument(<ComponentA />);
     expectDev(console.error.calls.count()).toBe(1);
     expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])).toBe(
       'Warning: ComponentA.childContextTypes is specified but there is no ' +
@@ -320,9 +320,9 @@ describe('ReactContextValidator', () => {
     );
 
     // Warnings should be deduped by component type
-    ReactTestUtils.renderIntoDocument(<ComponentA/>);
+    ReactTestUtils.renderIntoDocument(<ComponentA />);
     expectDev(console.error.calls.count()).toBe(1);
-    ReactTestUtils.renderIntoDocument(<ComponentB/>);
+    ReactTestUtils.renderIntoDocument(<ComponentB />);
     expectDev(console.error.calls.count()).toBe(2);
     expectDev(normalizeCodeLocInfo(console.error.calls.argsFor(1)[0])).toBe(
       'Warning: ComponentB.childContextTypes is specified but there is no ' +
@@ -371,7 +371,7 @@ describe('ReactContextValidator', () => {
       },
     });
 
-    ReactTestUtils.renderIntoDocument(<ParentContextProvider/>);
+    ReactTestUtils.renderIntoDocument(<ParentContextProvider />);
     expect(childContext.bar).toBeUndefined();
     expect(childContext.foo).toBe('FOO');
   });
diff --git a/src/isomorphic/classic/element/__tests__/ReactElement-test.js b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
index 13187cd3b0..db3cf3fce1 100644
--- a/src/isomorphic/classic/element/__tests__/ReactElement-test.js
+++ b/src/isomorphic/classic/element/__tests__/ReactElement-test.js
@@ -553,7 +553,7 @@ describe('comparing jsx vs .createFactory() vs .createElement()', () => {
           );
         },
       });
-      instance = ReactTestUtils.renderIntoDocument(<Parent/>);
+      instance = ReactTestUtils.renderIntoDocument(<Parent />);
     });
 
     it('should scry children but cannot', () => {
diff --git a/src/renderers/__tests__/ReactComponent-test.js b/src/renderers/__tests__/ReactComponent-test.js
index 024a729a39..bdc0e823a5 100644
--- a/src/renderers/__tests__/ReactComponent-test.js
+++ b/src/renderers/__tests__/ReactComponent-test.js
@@ -56,9 +56,9 @@ describe('ReactComponent', () => {
     expect(() => {
       ReactTestUtils.renderIntoDocument(
         <Wrapper>
-          <span key={0}/>
-          <span key={1}/>
-          <span key={2}/>
+          <span key={0} />
+          <span key={1} />
+          <span key={2} />
         </Wrapper>
       );
     }).toThrowError(/Cannot assign to read only property.*/);
@@ -81,9 +81,9 @@ describe('ReactComponent', () => {
     expect(() => {
       ReactTestUtils.renderIntoDocument(
         <Wrapper>
-          <span key={0}/>
-          <span key={1}/>
-          <span key={2}/>
+          <span key={0} />
+          <span key={1} />
+          <span key={2} />
         </Wrapper>
       );
     }).toThrowError(/Cannot assign to read only property.*/);
@@ -247,10 +247,10 @@ describe('ReactComponent', () => {
           <div>
             <Inner id={1} ref={(c) => {
               log.push(`ref 1 got ${c ? `instance ${c.props.id}` : 'null'}`);
-            }}/>
+            }} />
             <Inner id={2} ref={(c) => {
               log.push(`ref 2 got ${c ? `instance ${c.props.id}` : 'null'}`);
-            }}/>
+            }} />
           </div>
         );
       }
diff --git a/src/renderers/__tests__/ReactComponentLifeCycle-test.js b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
index 7c6c06cf75..ae512f1b53 100644
--- a/src/renderers/__tests__/ReactComponentLifeCycle-test.js
+++ b/src/renderers/__tests__/ReactComponentLifeCycle-test.js
@@ -248,7 +248,7 @@ describe('ReactComponentLifeCycle', () => {
       },
       render: function() {
         expect(this.isMounted()).toBeFalsy();
-        return <div/>;
+        return <div />;
       },
     });
 
@@ -292,7 +292,7 @@ describe('ReactComponentLifeCycle', () => {
   it('isMounted should return false when unmounted', () => {
     var Component = React.createClass({
       render: function() {
-        return <div/>;
+        return <div />;
       },
     });
 
@@ -319,7 +319,7 @@ describe('ReactComponentLifeCycle', () => {
         if (this.state.isMounted) {
           expect(ReactDOM.findDOMNode(this).tagName).toBe('DIV');
         }
-        return <div/>;
+        return <div />;
       },
     });
 
diff --git a/src/renderers/__tests__/ReactCompositeComponent-test.js b/src/renderers/__tests__/ReactCompositeComponent-test.js
index 03ad27e560..6346ff739d 100644
--- a/src/renderers/__tests__/ReactCompositeComponent-test.js
+++ b/src/renderers/__tests__/ReactCompositeComponent-test.js
@@ -138,19 +138,19 @@ describe('ReactCompositeComponent', () => {
   it('should not cache old DOM nodes when switching constructors', () => {
     var container = document.createElement('div');
     var instance = ReactDOM.render(
-      <ChildUpdates renderAnchor={true} anchorClassOn={false}/>,
+      <ChildUpdates renderAnchor={true} anchorClassOn={false} />,
       container
     );
     ReactDOM.render(  // Warm any cache
-      <ChildUpdates renderAnchor={true} anchorClassOn={true}/>,
+      <ChildUpdates renderAnchor={true} anchorClassOn={true} />,
       container
     );
     ReactDOM.render(  // Clear out the anchor
-      <ChildUpdates renderAnchor={false} anchorClassOn={true}/>,
+      <ChildUpdates renderAnchor={false} anchorClassOn={true} />,
       container
     );
     ReactDOM.render(  // rerender
-      <ChildUpdates renderAnchor={true} anchorClassOn={false}/>,
+      <ChildUpdates renderAnchor={true} anchorClassOn={false} />,
       container
     );
     expect(instance.getAnchor().className).toBe('');
diff --git a/src/renderers/__tests__/ReactMultiChild-test.js b/src/renderers/__tests__/ReactMultiChild-test.js
index 50156fdbd3..42d7f4296f 100644
--- a/src/renderers/__tests__/ReactMultiChild-test.js
+++ b/src/renderers/__tests__/ReactMultiChild-test.js
@@ -178,12 +178,12 @@ describe('ReactMultiChild', () => {
       }
 
       ReactDOM.render(
-        <Parent>{[<div key="1"/>]}</Parent>,
+        <Parent>{[<div key="1" />]}</Parent>,
         container
       );
 
       ReactDOM.render(
-        <Parent>{[<div key="1"/>, <div key="1"/>]}</Parent>,
+        <Parent>{[<div key="1" />, <div key="1" />]}</Parent>,
         container
       );
 
@@ -241,12 +241,12 @@ describe('ReactMultiChild', () => {
       }
 
       ReactDOM.render(
-        <Parent>{createIterable([<div key="1"/>])}</Parent>,
+        <Parent>{createIterable([<div key="1" />])}</Parent>,
         container
       );
 
       ReactDOM.render(
-        <Parent>{createIterable([<div key="1"/>, <div key="1"/>])}</Parent>,
+        <Parent>{createIterable([<div key="1" />, <div key="1" />])}</Parent>,
         container
       );
 
diff --git a/src/renderers/__tests__/refs-destruction-test.js b/src/renderers/__tests__/refs-destruction-test.js
index c0e5a81326..2ae242fa3c 100644
--- a/src/renderers/__tests__/refs-destruction-test.js
+++ b/src/renderers/__tests__/refs-destruction-test.js
@@ -107,20 +107,20 @@ describe('refs-destruction', () => {
     class AppModal extends React.Component {
       render() {
         return (<Modal>
-          <a ref="ref"/>
+          <a ref="ref" />
         </Modal>);
       }
     }
 
     class App extends React.Component {
       render() {
-        return this.props.hidden ? null : <AppModal onClose={this.close}/>;
+        return this.props.hidden ? null : <AppModal onClose={this.close} />;
       }
     }
 
     var container = document.createElement('div');
     ReactDOM.render(<App />, container);
-    ReactDOM.render(<App hidden={true}/>, container);
+    ReactDOM.render(<App hidden={true} />, container);
     jest.runAllTimers();
   });
 });
diff --git a/src/renderers/__tests__/refs-test.js b/src/renderers/__tests__/refs-test.js
index 10b5d54ac8..d94d200c99 100644
--- a/src/renderers/__tests__/refs-test.js
+++ b/src/renderers/__tests__/refs-test.js
@@ -77,7 +77,7 @@ class TestRefsComponent extends React.Component {
           Reset Me By Clicking This.
         </div>
         <GeneralContainerComponent ref="myContainer">
-          <ClickCounter ref="myCounter" initialCount={1}/>
+          <ClickCounter ref="myCounter" initialCount={1} />
         </GeneralContainerComponent>
       </div>
     );
diff --git a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
index 850e727a79..0676d9d453 100644
--- a/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
+++ b/src/renderers/dom/shared/__tests__/CSSPropertyOperations-test.js
@@ -112,7 +112,7 @@ describe('CSSPropertyOperations', () => {
       static displayName = 'Comp';
 
       render() {
-        return <div style={{ 'background-color': 'crimson' }}/>;
+        return <div style={{ 'background-color': 'crimson' }} />;
       }
     }
 
@@ -216,7 +216,7 @@ describe('CSSPropertyOperations', () => {
       static displayName = 'Comp';
 
       render() {
-        return <div style={{ fontSize: NaN }}/>;
+        return <div style={{ fontSize: NaN }} />;
       }
     }
 
diff --git a/src/renderers/dom/shared/__tests__/ReactDOM-test.js b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
index c7c574a8fb..5da34e3824 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOM-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOM-test.js
@@ -287,7 +287,7 @@ describe('ReactDOM', () => {
       ReactDOM.render(
         <div>
           <h1>Auto-focus Test</h1>
-          <input autoFocus={true}/>
+          <input autoFocus={true} />
           <p>The above input should be focused after mount.</p>
         </div>,
         container,
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
index dc9c8cecea..24232bd782 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMComponent-test.js
@@ -360,8 +360,8 @@ describe('ReactDOMComponent', () => {
 
     it('should properly update custom attributes on custom elements', () => {
       var container = document.createElement('div');
-      ReactDOM.render(<some-custom-element foo="bar"/>, container);
-      ReactDOM.render(<some-custom-element bar="buzz"/>, container);
+      ReactDOM.render(<some-custom-element foo="bar" />, container);
+      ReactDOM.render(<some-custom-element bar="buzz" />, container);
       var node = container.firstChild;
       expect(node.hasAttribute('foo')).toBe(false);
       expect(node.getAttribute('bar')).toBe('buzz');
@@ -637,7 +637,7 @@ describe('ReactDOMComponent', () => {
 
     it('should ignore attribute whitelist for elements with the "is: attribute', () => {
       var container = document.createElement('div');
-      ReactDOM.render(<button is="test" cowabunga="chevynova"/>, container);
+      ReactDOM.render(<button is="test" cowabunga="chevynova" />, container);
       expect(container.firstChild.hasAttribute('cowabunga')).toBe(true);
     });
 
@@ -838,7 +838,7 @@ describe('ReactDOMComponent', () => {
         }
       }
 
-      var returnedValue = ReactDOMServer.renderToString(<Container/>);
+      var returnedValue = ReactDOMServer.renderToString(<Container />);
       expect(returnedValue).not.toContain('</BR>');
       expectDev(console.error.calls.count()).toBe(1);
       expectDev(console.error.calls.argsFor(0)[0]).toContain(
@@ -1060,7 +1060,7 @@ describe('ReactDOMComponent', () => {
 
     it('should track input values', () => {
       var container = document.createElement('div');
-      var inst = ReactDOM.render(<input type="text" defaultValue="foo"/>, container);
+      var inst = ReactDOM.render(<input type="text" defaultValue="foo" />, container);
 
       var tracker = inputValueTracking._getTrackerFromNode(inst);
 
@@ -1069,7 +1069,7 @@ describe('ReactDOMComponent', () => {
 
     it('should track textarea values', () => {
       var container = document.createElement('div');
-      var inst = ReactDOM.render(<textarea defaultValue="foo"/>, container);
+      var inst = ReactDOM.render(<textarea defaultValue="foo" />, container);
 
       var tracker = inputValueTracking._getTrackerFromNode(inst);
 
@@ -1211,7 +1211,7 @@ describe('ReactDOMComponent', () => {
       }
 
       expect(function() {
-        ReactDOM.render(<Animal/>, container);
+        ReactDOM.render(<Animal />, container);
       }).toThrowError(
         'The `style` prop expects a mapping from style properties to values, ' +
         'not a string. For example, style={{marginRight: spacing + \'em\'}} ' +
@@ -1242,7 +1242,7 @@ describe('ReactDOMComponent', () => {
     if (!ReactDOMFeatureFlags.useFiber) {
       it('should clean up input value tracking', () => {
         var container = document.createElement('div');
-        var node = ReactDOM.render(<input type="text" defaultValue="foo"/>, container);
+        var node = ReactDOM.render(<input type="text" defaultValue="foo" />, container);
         var tracker = inputValueTracking._getTrackerFromNode(node);
 
         spyOn(tracker, 'stopTracking');
@@ -1254,7 +1254,7 @@ describe('ReactDOMComponent', () => {
 
       it('should clean up input textarea tracking', () => {
         var container = document.createElement('div');
-        var node = ReactDOM.render(<textarea defaultValue="foo"/>, container);
+        var node = ReactDOM.render(<textarea defaultValue="foo" />, container);
         var tracker = inputValueTracking._getTrackerFromNode(node);
 
         spyOn(tracker, 'stopTracking');
@@ -1303,7 +1303,7 @@ describe('ReactDOMComponent', () => {
 
     it('should not warn when server-side rendering `onScroll`', () => {
       spyOn(console, 'error');
-      ReactDOMServer.renderToString(<div onScroll={() => {}}/>);
+      ReactDOMServer.renderToString(<div onScroll={() => {}} />);
       expectDev(console.error).not.toHaveBeenCalled();
     });
   });
@@ -1614,8 +1614,8 @@ describe('ReactDOMComponent', () => {
 
     it('gives source code refs for unknown prop warning', () => {
       spyOn(console, 'error');
-      ReactTestUtils.renderIntoDocument(<div class="paladin"/>);
-      ReactTestUtils.renderIntoDocument(<input type="text" onclick="1"/>);
+      ReactTestUtils.renderIntoDocument(<div class="paladin" />);
+      ReactTestUtils.renderIntoDocument(<input type="text" onclick="1" />);
       expectDev(console.error.calls.count()).toBe(2);
       expect(
         normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])
@@ -1632,8 +1632,8 @@ describe('ReactDOMComponent', () => {
 
     it('gives source code refs for unknown prop warning (ssr)', () => {
       spyOn(console, 'error');
-      ReactDOMServer.renderToString(<div class="paladin"/>);
-      ReactDOMServer.renderToString(<input type="text" onclick="1"/>);
+      ReactDOMServer.renderToString(<div class="paladin" />);
+      ReactDOMServer.renderToString(<input type="text" onclick="1" />);
       expectDev(console.error.calls.count()).toBe(2);
       expect(
         normalizeCodeLocInfo(console.error.calls.argsFor(0)[0])
@@ -1669,11 +1669,11 @@ describe('ReactDOMComponent', () => {
 
       ReactTestUtils.renderIntoDocument(
         <div className="foo1">
-        <div class="foo2"/>
-        <div onClick="foo3"/>
-        <div onclick="foo4"/>
-        <div className="foo5"/>
-        <div className="foo6"/>
+        <div class="foo2" />
+        <div onClick="foo3" />
+        <div onclick="foo4" />
+        <div className="foo5" />
+        <div className="foo6" />
         </div>
       );
 
@@ -1697,11 +1697,11 @@ describe('ReactDOMComponent', () => {
 
       ReactDOMServer.renderToString(
         <div className="foo1">
-        <div class="foo2"/>
-        <div onClick="foo3"/>
-        <div onclick="foo4"/>
-        <div className="foo5"/>
-        <div className="foo6"/>
+        <div class="foo2" />
+        <div onClick="foo3" />
+        <div onclick="foo4" />
+        <div className="foo5" />
+        <div className="foo6" />
         </div>
       );
 
diff --git a/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js b/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
index 51e140d01c..338c899914 100644
--- a/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactDOMTextComponent-test.js
@@ -131,7 +131,7 @@ describe('ReactDOMTextComponent', () => {
 
   it('can reconcile text arbitrarily split into multiple nodes on some substitutions only', () => {
     var el = document.createElement('div');
-    var inst = ReactDOM.render(<div><span />{'bar'}<span />{'foobarbaz'}{'foo'}{'barfoo'}<span/></div>, el);
+    var inst = ReactDOM.render(<div><span />{'bar'}<span />{'foobarbaz'}{'foo'}{'barfoo'}<span /></div>, el);
 
     var container = ReactDOM.findDOMNode(inst);
     let childNodes = filterOutComments(ReactDOM.findDOMNode(inst).childNodes);
@@ -143,7 +143,7 @@ describe('ReactDOMTextComponent', () => {
     secondTextNode.textContent = 'bar';
     container.insertBefore(document.createTextNode('foo'), childNodes[5].nextSibling);
 
-    inst = ReactDOM.render(<div><span />{'baz'}<span />{'barbazqux'}{'bar'}{'bazbar'}<span/></div>, el);
+    inst = ReactDOM.render(<div><span />{'baz'}<span />{'barbazqux'}{'bar'}{'bazbar'}<span /></div>, el);
     container = ReactDOM.findDOMNode(inst);
     expect(container.textContent).toBe('bazbarbazquxbarbazbar');
   });
diff --git a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
index 296bb572b5..5dca8f2616 100644
--- a/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
+++ b/src/renderers/dom/shared/__tests__/ReactServerRendering-test.js
@@ -542,9 +542,9 @@ describe('ReactDOMServer', () => {
     expect(() => {
       ReactDOMServer.renderToStaticMarkup(
         <Wrapper>
-          <span key={0}/>
-          <span key={1}/>
-          <span key={2}/>
+          <span key={0} />
+          <span key={1} />
+          <span key={2} />
         </Wrapper>
       );
     }).toThrowError(/Cannot assign to read only property.*/);
diff --git a/src/renderers/dom/shared/__tests__/findDOMNode-test.js b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
index 6ede9820d5..6928f53ff2 100644
--- a/src/renderers/dom/shared/__tests__/findDOMNode-test.js
+++ b/src/renderers/dom/shared/__tests__/findDOMNode-test.js
@@ -91,11 +91,11 @@ describe('findDOMNode', () => {
       }
 
       render() {
-        return <div/>;
+        return <div />;
       }
     }
 
-    expect(() => ReactTestUtils.renderIntoDocument(<Bar/>)).not.toThrow();
+    expect(() => ReactTestUtils.renderIntoDocument(<Bar />)).not.toThrow();
   });
 
 });
diff --git a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
index efe04b0874..fc58c74e71 100644
--- a/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
+++ b/src/renderers/dom/shared/eventPlugins/__tests__/ChangeEventPlugin-test.js
@@ -48,7 +48,7 @@ describe('ChangeEventPlugin', () => {
       expect(e.type).toBe('change');
     }
 
-    var input = ReactTestUtils.renderIntoDocument(<input type="checkbox" onChange={cb}/>);
+    var input = ReactTestUtils.renderIntoDocument(<input type="checkbox" onChange={cb} />);
 
     setUntrackedValue(input, true);
     ReactTestUtils.SimulateNative.click(input);
@@ -58,7 +58,7 @@ describe('ChangeEventPlugin', () => {
 
   it('should catch setting the value programmatically', () => {
     var input = ReactTestUtils.renderIntoDocument(
-      <input type="text" defaultValue="foo"/>
+      <input type="text" defaultValue="foo" />
     );
 
     input.value = 'bar';
@@ -74,7 +74,7 @@ describe('ChangeEventPlugin', () => {
     }
 
     var input = ReactTestUtils.renderIntoDocument(
-      <input type="text" onChange={cb} defaultValue="foo"/>
+      <input type="text" onChange={cb} defaultValue="foo" />
     );
 
     input.value = 'bar';
@@ -124,7 +124,7 @@ describe('ChangeEventPlugin', () => {
       called += 1;
     }
 
-    var input = ReactTestUtils.renderIntoDocument(<input type="radio" onChange={cb}/>);
+    var input = ReactTestUtils.renderIntoDocument(<input type="radio" onChange={cb} />);
     setUntrackedValue(input, true);
     ReactTestUtils.SimulateNative.click(input);
     ReactTestUtils.SimulateNative.click(input);
@@ -141,9 +141,9 @@ describe('ChangeEventPlugin', () => {
     }
 
     [
-      <input type="text" onChange={cb}/>,
-      <input type="number" onChange={cb}/>,
-      <input type="range" onChange={cb}/>,
+      <input type="text" onChange={cb} />,
+      <input type="number" onChange={cb} />,
+      <input type="range" onChange={cb} />,
     ].forEach(function(element) {
       called = 0;
       input = ReactTestUtils.renderIntoDocument(element);
@@ -181,7 +181,7 @@ describe('ChangeEventPlugin', () => {
       return;
     }
 
-    var input = ReactTestUtils.renderIntoDocument(<input type="range" onChange={cb}/>);
+    var input = ReactTestUtils.renderIntoDocument(<input type="range" onChange={cb} />);
     setUntrackedValue(input, 'bar');
 
     ReactTestUtils.SimulateNative.input(input);
@@ -201,7 +201,7 @@ describe('ChangeEventPlugin', () => {
       expect(e.type).toBe('change');
     }
 
-    var input = ReactTestUtils.renderIntoDocument(<input type="range" onChange={cb}/>);
+    var input = ReactTestUtils.renderIntoDocument(<input type="range" onChange={cb} />);
     setUntrackedValue(input, '40');
     ReactTestUtils.SimulateNative.input(input);
     ReactTestUtils.SimulateNative.change(input);
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
index 7cc4d2e97b..8c9002e2a1 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMInput-test.js
@@ -407,7 +407,7 @@ describe('ReactDOMInput', () => {
     ReactDOM.render(<input value="a" />, container);
     expect(nodeValueSetter.mock.calls.length).toBe(0);
 
-    ReactDOM.render(<input value="b"/>, container);
+    ReactDOM.render(<input value="b" />, container);
     expect(nodeValueSetter.mock.calls.length).toBe(1);
   });
 
diff --git a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
index ec5033a6d6..a8a0c0b712 100644
--- a/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
+++ b/src/renderers/dom/shared/wrappers/__tests__/ReactDOMSelect-test.js
@@ -429,14 +429,14 @@ describe('ReactDOMSelect', () => {
   it('should warn if value is null', () => {
     spyOn(console, 'error');
 
-    ReactTestUtils.renderIntoDocument(<select value={null}><option value="test"/></select>);
+    ReactTestUtils.renderIntoDocument(<select value={null}><option value="test" /></select>);
     expectDev(console.error.calls.argsFor(0)[0]).toContain(
       '`value` prop on `select` should not be null. ' +
       'Consider using the empty string to clear the component or `undefined` ' +
       'for uncontrolled components.'
     );
 
-    ReactTestUtils.renderIntoDocument(<select value={null}><option value="test"/></select>);
+    ReactTestUtils.renderIntoDocument(<select value={null}><option value="test" /></select>);
     expectDev(console.error.calls.count()).toBe(1);
   });
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
index 1fac05e87f..7dcf12dfd7 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalErrorHandling-test.js
@@ -965,12 +965,12 @@ describe('ReactIncrementalErrorHandling', () => {
           throw Error('componentWillMount error');
         }
         render() {
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -999,12 +999,12 @@ describe('ReactIncrementalErrorHandling', () => {
           throw Error('componentDidMount error');
         }
         render() {
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -1045,7 +1045,7 @@ describe('ReactIncrementalErrorHandling', () => {
       );
 
       try {
-        ReactNoop.render(<div><span><ErrorThrowingComponent/></span></div>);
+        ReactNoop.render(<div><span><ErrorThrowingComponent /></span></div>);
         ReactNoop.flushDeferredPri();
       } catch (error) {}
 
@@ -1062,7 +1062,7 @@ describe('ReactIncrementalErrorHandling', () => {
 
       class ParentComponent extends React.Component {
         render() {
-          return <ErrorBoundaryComponent/>;
+          return <ErrorBoundaryComponent />;
         }
       }
 
@@ -1075,7 +1075,7 @@ describe('ReactIncrementalErrorHandling', () => {
           this.setState({}); // Render again
         }
         render() {
-          return <ErrorThrowingComponent/>;
+          return <ErrorThrowingComponent />;
         }
       }
 
@@ -1085,12 +1085,12 @@ describe('ReactIncrementalErrorHandling', () => {
         }
         render() {
           renderAttempts++;
-          return <div/>;
+          return <div />;
         }
       }
 
       try {
-        ReactNoop.render(<ParentComponent/>);
+        ReactNoop.render(<ParentComponent />);
         ReactNoop.flush();
       } catch (error) {}
 
diff --git a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
index b6c24ccbe6..6b7b9785df 100644
--- a/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
+++ b/src/renderers/shared/fiber/__tests__/ReactIncrementalSideEffects-test.js
@@ -489,7 +489,7 @@ describe('ReactIncrementalSideEffects', () => {
 
   it('can update a completed tree before it has a chance to commit', () => {
     function Foo(props) {
-      return <span prop={props.step}/>;
+      return <span prop={props.step} />;
     }
     ReactNoop.render(<Foo step={1} />);
     // This should be just enough to complete the tree without committing it