diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 3ef2c6ada2a..6b59bd2df2b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -7299,6 +7299,16 @@ namespace ts {
             checkGrammarJsxElement(node);
             checkJsxPreconditions(node);
 
+            // If we're compiling under --jsx react, the symbol 'React' should
+            // be marked as 'used' so we don't incorrectly elide its import. And if there
+            // is no 'React' symbol in scope, we should issue an error.
+            if (compilerOptions.jsx === JsxEmit.React) {
+                let reactSym = resolveName(node.tagName, 'React', SymbolFlags.Value, Diagnostics.Cannot_find_name_0, 'React');
+                if (reactSym) {
+                    getSymbolLinks(reactSym).referenced = true;
+                }
+            }
+
             let targetAttributesType = getJsxElementAttributesType(node);
 
             if (getNodeLinks(node).jsxFlags & JsxFlags.ClassElement) {
diff --git a/tests/baselines/reference/tsxElementResolution19.js b/tests/baselines/reference/tsxElementResolution19.js
new file mode 100644
index 00000000000..72612e8ce54
--- /dev/null
+++ b/tests/baselines/reference/tsxElementResolution19.js
@@ -0,0 +1,36 @@
+//// [tests/cases/conformance/jsx/tsxElementResolution19.tsx] ////
+
+//// [react.d.ts]
+
+declare module "react" {
+
+}
+
+//// [file1.tsx]
+declare module JSX {
+    interface Element { }
+}
+export class MyClass { }
+
+//// [file2.tsx]
+
+// Should not elide React import
+import * as React from 'react';
+import {MyClass} from './file1';
+
+<MyClass />;
+
+
+//// [file1.js]
+define(["require", "exports"], function (require, exports) {
+    var MyClass = (function () {
+        function MyClass() {
+        }
+        return MyClass;
+    })();
+    exports.MyClass = MyClass;
+});
+//// [file2.js]
+define(["require", "exports", 'react', './file1'], function (require, exports, React, file1_1) {
+    React.createElement(file1_1.MyClass, null);
+});
diff --git a/tests/baselines/reference/tsxElementResolution19.symbols b/tests/baselines/reference/tsxElementResolution19.symbols
new file mode 100644
index 00000000000..48aa4f962b6
--- /dev/null
+++ b/tests/baselines/reference/tsxElementResolution19.symbols
@@ -0,0 +1,28 @@
+=== tests/cases/conformance/jsx/react.d.ts ===
+
+No type information for this code.declare module "react" {
+No type information for this code.
+No type information for this code.}
+No type information for this code.
+No type information for this code.=== tests/cases/conformance/jsx/file1.tsx ===
+declare module JSX {
+>JSX : Symbol(JSX, Decl(file1.tsx, 0, 0))
+
+    interface Element { }
+>Element : Symbol(Element, Decl(file1.tsx, 0, 20))
+}
+export class MyClass { }
+>MyClass : Symbol(MyClass, Decl(file1.tsx, 2, 1))
+
+=== tests/cases/conformance/jsx/file2.tsx ===
+
+// Should not elide React import
+import * as React from 'react';
+>React : Symbol(React, Decl(file2.tsx, 2, 6))
+
+import {MyClass} from './file1';
+>MyClass : Symbol(MyClass, Decl(file2.tsx, 3, 8))
+
+<MyClass />;
+>MyClass : Symbol(MyClass, Decl(file2.tsx, 3, 8))
+
diff --git a/tests/baselines/reference/tsxElementResolution19.types b/tests/baselines/reference/tsxElementResolution19.types
new file mode 100644
index 00000000000..0fa1eefe5f6
--- /dev/null
+++ b/tests/baselines/reference/tsxElementResolution19.types
@@ -0,0 +1,29 @@
+=== tests/cases/conformance/jsx/react.d.ts ===
+
+No type information for this code.declare module "react" {
+No type information for this code.
+No type information for this code.}
+No type information for this code.
+No type information for this code.=== tests/cases/conformance/jsx/file1.tsx ===
+declare module JSX {
+>JSX : any
+
+    interface Element { }
+>Element : Element
+}
+export class MyClass { }
+>MyClass : MyClass
+
+=== tests/cases/conformance/jsx/file2.tsx ===
+
+// Should not elide React import
+import * as React from 'react';
+>React : typeof React
+
+import {MyClass} from './file1';
+>MyClass : typeof MyClass
+
+<MyClass />;
+><MyClass /> : any
+>MyClass : typeof MyClass
+
diff --git a/tests/baselines/reference/tsxReactEmit1.js b/tests/baselines/reference/tsxReactEmit1.js
index b6c5fd96183..f1799e5bb77 100644
--- a/tests/baselines/reference/tsxReactEmit1.js
+++ b/tests/baselines/reference/tsxReactEmit1.js
@@ -5,6 +5,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p;
 var selfClosed1 = <div />;
diff --git a/tests/baselines/reference/tsxReactEmit1.symbols b/tests/baselines/reference/tsxReactEmit1.symbols
index 60fa5e70b0a..c9e819c82d3 100644
--- a/tests/baselines/reference/tsxReactEmit1.symbols
+++ b/tests/baselines/reference/tsxReactEmit1.symbols
@@ -12,133 +12,135 @@ declare module JSX {
 >s : Symbol(s, Decl(tsxReactEmit1.tsx, 3, 3))
 	}
 }
+declare var React: any;
+>React : Symbol(React, Decl(tsxReactEmit1.tsx, 6, 11))
 
 var p;
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
 
 var selfClosed1 = <div />;
->selfClosed1 : Symbol(selfClosed1, Decl(tsxReactEmit1.tsx, 8, 3))
+>selfClosed1 : Symbol(selfClosed1, Decl(tsxReactEmit1.tsx, 9, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 
 var selfClosed2 = <div x="1" />;
->selfClosed2 : Symbol(selfClosed2, Decl(tsxReactEmit1.tsx, 9, 3))
+>selfClosed2 : Symbol(selfClosed2, Decl(tsxReactEmit1.tsx, 10, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 
 var selfClosed3 = <div x='1' />;
->selfClosed3 : Symbol(selfClosed3, Decl(tsxReactEmit1.tsx, 10, 3))
+>selfClosed3 : Symbol(selfClosed3, Decl(tsxReactEmit1.tsx, 11, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 
 var selfClosed4 = <div x="1" y='0' />;
->selfClosed4 : Symbol(selfClosed4, Decl(tsxReactEmit1.tsx, 11, 3))
+>selfClosed4 : Symbol(selfClosed4, Decl(tsxReactEmit1.tsx, 12, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 >y : Symbol(unknown)
 
 var selfClosed5 = <div x={0} y='0' />;
->selfClosed5 : Symbol(selfClosed5, Decl(tsxReactEmit1.tsx, 12, 3))
+>selfClosed5 : Symbol(selfClosed5, Decl(tsxReactEmit1.tsx, 13, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 >y : Symbol(unknown)
 
 var selfClosed6 = <div x={"1"} y='0' />;
->selfClosed6 : Symbol(selfClosed6, Decl(tsxReactEmit1.tsx, 13, 3))
+>selfClosed6 : Symbol(selfClosed6, Decl(tsxReactEmit1.tsx, 14, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 >y : Symbol(unknown)
 
 var selfClosed7 = <div x={p} y='p' b />;
->selfClosed7 : Symbol(selfClosed7, Decl(tsxReactEmit1.tsx, 14, 3))
+>selfClosed7 : Symbol(selfClosed7, Decl(tsxReactEmit1.tsx, 15, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >x : Symbol(unknown)
 >y : Symbol(unknown)
 >b : Symbol(unknown)
 
 var openClosed1 = <div></div>;
->openClosed1 : Symbol(openClosed1, Decl(tsxReactEmit1.tsx, 16, 3))
+>openClosed1 : Symbol(openClosed1, Decl(tsxReactEmit1.tsx, 17, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 
 var openClosed2 = <div n='m'>foo</div>;
->openClosed2 : Symbol(openClosed2, Decl(tsxReactEmit1.tsx, 17, 3))
+>openClosed2 : Symbol(openClosed2, Decl(tsxReactEmit1.tsx, 18, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >n : Symbol(unknown)
 
 var openClosed3 = <div n='m'>{p}</div>;
->openClosed3 : Symbol(openClosed3, Decl(tsxReactEmit1.tsx, 18, 3))
+>openClosed3 : Symbol(openClosed3, Decl(tsxReactEmit1.tsx, 19, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >n : Symbol(unknown)
 
 var openClosed4 = <div n='m'>{p < p}</div>;
->openClosed4 : Symbol(openClosed4, Decl(tsxReactEmit1.tsx, 19, 3))
+>openClosed4 : Symbol(openClosed4, Decl(tsxReactEmit1.tsx, 20, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >n : Symbol(unknown)
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
 
 var openClosed5 = <div n='m' b>{p > p}</div>;
->openClosed5 : Symbol(openClosed5, Decl(tsxReactEmit1.tsx, 20, 3))
+>openClosed5 : Symbol(openClosed5, Decl(tsxReactEmit1.tsx, 21, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >n : Symbol(unknown)
 >b : Symbol(unknown)
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
 
 class SomeClass {
->SomeClass : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 20, 45))
+>SomeClass : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45))
 
 	f() {
->f : Symbol(f, Decl(tsxReactEmit1.tsx, 22, 17))
+>f : Symbol(f, Decl(tsxReactEmit1.tsx, 23, 17))
 
 		var rewrites1 = <div>{() => this}</div>;
->rewrites1 : Symbol(rewrites1, Decl(tsxReactEmit1.tsx, 24, 5))
+>rewrites1 : Symbol(rewrites1, Decl(tsxReactEmit1.tsx, 25, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
->this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 20, 45))
+>this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45))
 
 		var rewrites2 = <div>{[p, ...p, p]}</div>;
->rewrites2 : Symbol(rewrites2, Decl(tsxReactEmit1.tsx, 25, 5))
+>rewrites2 : Symbol(rewrites2, Decl(tsxReactEmit1.tsx, 26, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
 
 		var rewrites3 = <div>{{p}}</div>;
->rewrites3 : Symbol(rewrites3, Decl(tsxReactEmit1.tsx, 26, 5))
+>rewrites3 : Symbol(rewrites3, Decl(tsxReactEmit1.tsx, 27, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 26, 25))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 27, 25))
 
 		var rewrites4 = <div a={() => this}></div>;
->rewrites4 : Symbol(rewrites4, Decl(tsxReactEmit1.tsx, 28, 5))
+>rewrites4 : Symbol(rewrites4, Decl(tsxReactEmit1.tsx, 29, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >a : Symbol(unknown)
->this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 20, 45))
+>this : Symbol(SomeClass, Decl(tsxReactEmit1.tsx, 21, 45))
 
 		var rewrites5 = <div a={[p, ...p, p]}></div>;
->rewrites5 : Symbol(rewrites5, Decl(tsxReactEmit1.tsx, 29, 5))
+>rewrites5 : Symbol(rewrites5, Decl(tsxReactEmit1.tsx, 30, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >a : Symbol(unknown)
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 7, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 8, 3))
 
 		var rewrites6 = <div a={{p}}></div>;
->rewrites6 : Symbol(rewrites6, Decl(tsxReactEmit1.tsx, 30, 5))
+>rewrites6 : Symbol(rewrites6, Decl(tsxReactEmit1.tsx, 31, 5))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 >a : Symbol(unknown)
->p : Symbol(p, Decl(tsxReactEmit1.tsx, 30, 27))
+>p : Symbol(p, Decl(tsxReactEmit1.tsx, 31, 27))
 	}
 }
 
 var whitespace1 = <div>      </div>;
->whitespace1 : Symbol(whitespace1, Decl(tsxReactEmit1.tsx, 34, 3))
+>whitespace1 : Symbol(whitespace1, Decl(tsxReactEmit1.tsx, 35, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 
 var whitespace2 = <div>  {p}    </div>;
->whitespace2 : Symbol(whitespace2, Decl(tsxReactEmit1.tsx, 35, 3))
+>whitespace2 : Symbol(whitespace2, Decl(tsxReactEmit1.tsx, 36, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 
 var whitespace3 = <div>  
->whitespace3 : Symbol(whitespace3, Decl(tsxReactEmit1.tsx, 36, 3))
+>whitespace3 : Symbol(whitespace3, Decl(tsxReactEmit1.tsx, 37, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit1.tsx, 1, 22))
 
       {p}    
diff --git a/tests/baselines/reference/tsxReactEmit1.types b/tests/baselines/reference/tsxReactEmit1.types
index d23cad4560a..0b6e03c5742 100644
--- a/tests/baselines/reference/tsxReactEmit1.types
+++ b/tests/baselines/reference/tsxReactEmit1.types
@@ -12,6 +12,8 @@ declare module JSX {
 >s : string
 	}
 }
+declare var React: any;
+>React : any
 
 var p;
 >p : any
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index f4a12946ed9..4b2b4695561 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -5,6 +5,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p1, p2, p3;
 var spreads1 = <div {...p1}>{p2}</div>;
diff --git a/tests/baselines/reference/tsxReactEmit2.symbols b/tests/baselines/reference/tsxReactEmit2.symbols
index 9607d9330da..9cf739c960c 100644
--- a/tests/baselines/reference/tsxReactEmit2.symbols
+++ b/tests/baselines/reference/tsxReactEmit2.symbols
@@ -12,32 +12,34 @@ declare module JSX {
 >s : Symbol(s, Decl(tsxReactEmit2.tsx, 3, 3))
 	}
 }
+declare var React: any;
+>React : Symbol(React, Decl(tsxReactEmit2.tsx, 6, 11))
 
 var p1, p2, p3;
->p1 : Symbol(p1, Decl(tsxReactEmit2.tsx, 7, 3))
->p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 7, 7))
->p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 7, 11))
+>p1 : Symbol(p1, Decl(tsxReactEmit2.tsx, 8, 3))
+>p2 : Symbol(p2, Decl(tsxReactEmit2.tsx, 8, 7))
+>p3 : Symbol(p3, Decl(tsxReactEmit2.tsx, 8, 11))
 
 var spreads1 = <div {...p1}>{p2}</div>;
->spreads1 : Symbol(spreads1, Decl(tsxReactEmit2.tsx, 8, 3))
+>spreads1 : Symbol(spreads1, Decl(tsxReactEmit2.tsx, 9, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22))
 
 var spreads2 = <div {...p1}>{p2}</div>;
->spreads2 : Symbol(spreads2, Decl(tsxReactEmit2.tsx, 9, 3))
+>spreads2 : Symbol(spreads2, Decl(tsxReactEmit2.tsx, 10, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22))
 
 var spreads3 = <div x={p3} {...p1}>{p2}</div>;
->spreads3 : Symbol(spreads3, Decl(tsxReactEmit2.tsx, 10, 3))
+>spreads3 : Symbol(spreads3, Decl(tsxReactEmit2.tsx, 11, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22))
 >x : Symbol(unknown)
 
 var spreads4 = <div {...p1} x={p3} >{p2}</div>;
->spreads4 : Symbol(spreads4, Decl(tsxReactEmit2.tsx, 11, 3))
+>spreads4 : Symbol(spreads4, Decl(tsxReactEmit2.tsx, 12, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22))
 >x : Symbol(unknown)
 
 var spreads5 = <div x={p2} {...p1} y={p3}>{p2}</div>;
->spreads5 : Symbol(spreads5, Decl(tsxReactEmit2.tsx, 12, 3))
+>spreads5 : Symbol(spreads5, Decl(tsxReactEmit2.tsx, 13, 3))
 >div : Symbol(JSX.IntrinsicElements, Decl(tsxReactEmit2.tsx, 1, 22))
 >x : Symbol(unknown)
 >y : Symbol(unknown)
diff --git a/tests/baselines/reference/tsxReactEmit2.types b/tests/baselines/reference/tsxReactEmit2.types
index 9f8d6e494d0..e28910b62c7 100644
--- a/tests/baselines/reference/tsxReactEmit2.types
+++ b/tests/baselines/reference/tsxReactEmit2.types
@@ -12,6 +12,8 @@ declare module JSX {
 >s : string
 	}
 }
+declare var React: any;
+>React : any
 
 var p1, p2, p3;
 >p1 : any
diff --git a/tests/baselines/reference/tsxReactEmit3.js b/tests/baselines/reference/tsxReactEmit3.js
index d31fec1c550..1a6ba037230 100644
--- a/tests/baselines/reference/tsxReactEmit3.js
+++ b/tests/baselines/reference/tsxReactEmit3.js
@@ -1,6 +1,7 @@
 //// [tsxReactEmit3.tsx]
 
 declare module JSX { interface Element { } }
+declare var React: any;
 
 declare var Foo, Bar, baz;
 
diff --git a/tests/baselines/reference/tsxReactEmit3.symbols b/tests/baselines/reference/tsxReactEmit3.symbols
index 8ef0ccab241..857647400a9 100644
--- a/tests/baselines/reference/tsxReactEmit3.symbols
+++ b/tests/baselines/reference/tsxReactEmit3.symbols
@@ -4,15 +4,18 @@ declare module JSX { interface Element { } }
 >JSX : Symbol(JSX, Decl(tsxReactEmit3.tsx, 0, 0))
 >Element : Symbol(Element, Decl(tsxReactEmit3.tsx, 1, 20))
 
+declare var React: any;
+>React : Symbol(React, Decl(tsxReactEmit3.tsx, 2, 11))
+
 declare var Foo, Bar, baz;
->Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 3, 11))
->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 3, 16))
->baz : Symbol(baz, Decl(tsxReactEmit3.tsx, 3, 21))
+>Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 4, 11))
+>Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16))
+>baz : Symbol(baz, Decl(tsxReactEmit3.tsx, 4, 21))
 
 <Foo> <Bar> q </Bar> <Bar/>   s <Bar/><Bar/></Foo>;
->Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 3, 11))
->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 3, 16))
->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 3, 16))
->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 3, 16))
->Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 3, 16))
+>Foo : Symbol(Foo, Decl(tsxReactEmit3.tsx, 4, 11))
+>Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16))
+>Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16))
+>Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16))
+>Bar : Symbol(Bar, Decl(tsxReactEmit3.tsx, 4, 16))
 
diff --git a/tests/baselines/reference/tsxReactEmit3.types b/tests/baselines/reference/tsxReactEmit3.types
index 9e5d9fece56..8babe724fa1 100644
--- a/tests/baselines/reference/tsxReactEmit3.types
+++ b/tests/baselines/reference/tsxReactEmit3.types
@@ -4,6 +4,9 @@ declare module JSX { interface Element { } }
 >JSX : any
 >Element : Element
 
+declare var React: any;
+>React : any
+
 declare var Foo, Bar, baz;
 >Foo : any
 >Bar : any
diff --git a/tests/baselines/reference/tsxReactEmit4.errors.txt b/tests/baselines/reference/tsxReactEmit4.errors.txt
index 00b7cb8d019..fca2b028237 100644
--- a/tests/baselines/reference/tsxReactEmit4.errors.txt
+++ b/tests/baselines/reference/tsxReactEmit4.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/jsx/tsxReactEmit4.tsx(11,5): error TS2304: Cannot find name 'blah'.
+tests/cases/conformance/jsx/tsxReactEmit4.tsx(12,5): error TS2304: Cannot find name 'blah'.
 
 
 ==== tests/cases/conformance/jsx/tsxReactEmit4.tsx (1 errors) ====
@@ -8,6 +8,7 @@ tests/cases/conformance/jsx/tsxReactEmit4.tsx(11,5): error TS2304: Cannot find n
     		[s: string]: any;
     	}
     }
+    declare var React: any;
     
     var p;
     var openClosed1 = <div>
diff --git a/tests/baselines/reference/tsxReactEmit4.js b/tests/baselines/reference/tsxReactEmit4.js
index 2254c4dd651..dcbfafcef2f 100644
--- a/tests/baselines/reference/tsxReactEmit4.js
+++ b/tests/baselines/reference/tsxReactEmit4.js
@@ -5,6 +5,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p;
 var openClosed1 = <div>
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.js b/tests/baselines/reference/tsxReactEmitWhitespace.js
index 2f32295c279..a124ce73312 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace.js
+++ b/tests/baselines/reference/tsxReactEmitWhitespace.js
@@ -5,6 +5,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING
 // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.symbols b/tests/baselines/reference/tsxReactEmitWhitespace.symbols
index afbb6944981..06c8258a2c2 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace.symbols
+++ b/tests/baselines/reference/tsxReactEmitWhitespace.symbols
@@ -12,12 +12,14 @@ declare module JSX {
 >s : Symbol(s, Decl(tsxReactEmitWhitespace.tsx, 3, 3))
 	}
 }
+declare var React: any;
+>React : Symbol(React, Decl(tsxReactEmitWhitespace.tsx, 6, 11))
 
 // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING
 // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT
 
 var p = 0;
->p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 10, 3))
+>p : Symbol(p, Decl(tsxReactEmitWhitespace.tsx, 11, 3))
 
 // Emit "   "
 <div>   </div>;
diff --git a/tests/baselines/reference/tsxReactEmitWhitespace.types b/tests/baselines/reference/tsxReactEmitWhitespace.types
index e0e3639fa9b..603dc4ca6c1 100644
--- a/tests/baselines/reference/tsxReactEmitWhitespace.types
+++ b/tests/baselines/reference/tsxReactEmitWhitespace.types
@@ -12,6 +12,8 @@ declare module JSX {
 >s : string
 	}
 }
+declare var React: any;
+>React : any
 
 // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING
 // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx
deleted file mode 100644
index fb54f9d7c82..00000000000
--- a/tests/cases/conformance/jsx/tsxAttributeResolution1.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// OK
-<test1 x={0}/>; // OK
-<test1 />; // OK
-<test1 data-x={true}/>; // OK
-<test2 reqd='true'/>; // OK
-<test2 reqd={'true'}/>; // OK
-// Errors
-<test1 x={'0'}/>; // Error, '0' is not number
-<test1 y={0}/>; // Error, no property "y"
-<test1 y="foo"/>; // Error, no property "y"
-<test1 x="32"/>; // Error, "32" is not number
-// TODO attribute 'var' should be parseable
-// <test1 var="10" />; // Error, no 'var' property
-<test2 />; // Error, missing reqd
-<test2 reqd={10}/>; // Error, reqd is not string
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx
deleted file mode 100644
index 7c47046dcde..00000000000
--- a/tests/cases/conformance/jsx/tsxAttributeResolution2.jsx
+++ /dev/null
@@ -1,5 +0,0 @@
-// OK
-<test1 c1={function (x) { return x.length; }}/>; // OK
-<test1 data-c1={function (x) { return x.leng; }}/>; // OK
-// Errors
-<test1 c1={function (x) { return x.leng; }}/>; // Error, no leng on 'string'
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx
deleted file mode 100644
index 46cb5d8ff69..00000000000
--- a/tests/cases/conformance/jsx/tsxAttributeResolution3.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-// OK
-var obj1 = { x: 'foo' };
-<test1 {...obj1}/>;
-// Error, x is not string
-var obj2 = { x: 32 };
-<test1 {...obj2}/>;
-// Error, x is missing
-var obj3 = { y: 32 };
-<test1 {...obj3}/>;
-// OK
-var obj4 = { x: 32, y: 32 };
-<test1 {...obj4} x="ok"/>;
-// Error
-var obj5 = { x: 32, y: 32 };
-<test1 x="ok" {...obj5}/>;
-// OK
-var obj6 = { x: 'ok', y: 32, extra: 100 };
-<test1 {...obj6}/>;
-// Error
-var obj7 = { x: 'foo' };
-<test1 x={32} {...obj7}/>;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx
deleted file mode 100644
index da2e1d12038..00000000000
--- a/tests/cases/conformance/jsx/tsxAttributeResolution4.jsx
+++ /dev/null
@@ -1,4 +0,0 @@
-// OK
-<test1 {...{ x: function (n) { return 0; } }}/>;
-// Error, no member 'len' on 'string'
-<test1 {...{ x: function (n) { return n.len; } }}/>;
diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx b/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx
deleted file mode 100644
index 3e4c89d06fb..00000000000
--- a/tests/cases/conformance/jsx/tsxAttributeResolution5.jsx
+++ /dev/null
@@ -1,11 +0,0 @@
-function make1(obj) {
-    return <test1 {...obj}/>; // OK
-}
-function make2(obj) {
-    return <test1 {...obj}/>; // Error (x is number, not string)
-}
-function make3(obj) {
-    return <test1 {...obj}/>; // Error, missing x
-}
-<test1 {...{}}/>; // Error, missing x
-<test2 {...{}}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution1.jsx b/tests/cases/conformance/jsx/tsxElementResolution1.jsx
deleted file mode 100644
index 97357dbba8e..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution1.jsx
+++ /dev/null
@@ -1,4 +0,0 @@
-// OK
-<div />;
-// Fail
-<span />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution11.jsx b/tests/cases/conformance/jsx/tsxElementResolution11.jsx
deleted file mode 100644
index 6349906508c..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution11.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-var Obj1;
-<Obj1 x={10}/>; // OK
-var Obj2;
-<Obj2 x={10}/>; // Error
-var Obj3;
-<Obj3 x={10}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution12.jsx b/tests/cases/conformance/jsx/tsxElementResolution12.jsx
deleted file mode 100644
index ef137fd0e29..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution12.jsx
+++ /dev/null
@@ -1,9 +0,0 @@
-var obj1;
-<obj1 x={10}/>; // OK
-var obj2;
-<obj2 x={10}/>; // OK
-var obj3;
-<obj3 x={10}/>; // Error
-var obj4;
-<obj4 x={10}/>; // OK
-<obj4 x={'10'}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution13.jsx b/tests/cases/conformance/jsx/tsxElementResolution13.jsx
deleted file mode 100644
index 6a55efa612d..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution13.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-var obj1;
-<obj1 x={10}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution14.jsx b/tests/cases/conformance/jsx/tsxElementResolution14.jsx
deleted file mode 100644
index 29df7710af1..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution14.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-var obj1;
-<obj1 x={10}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxElementResolution15.jsx b/tests/cases/conformance/jsx/tsxElementResolution15.jsx
deleted file mode 100644
index 6a55efa612d..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution15.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-var obj1;
-<obj1 x={10}/>; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution16.jsx b/tests/cases/conformance/jsx/tsxElementResolution16.jsx
deleted file mode 100644
index e1987489bbb..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution16.jsx
+++ /dev/null
@@ -1,2 +0,0 @@
-var obj1;
-<obj1 x={10}/>; // Error (JSX.Element is missing)
diff --git a/tests/cases/conformance/jsx/tsxElementResolution19.tsx b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
new file mode 100644
index 00000000000..23e503ae962
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxElementResolution19.tsx
@@ -0,0 +1,21 @@
+//@jsx: react
+//@module: amd
+
+//@filename: react.d.ts
+declare module "react" {
+
+}
+
+//@filename: file1.tsx
+declare module JSX {
+    interface Element { }
+}
+export class MyClass { }
+
+//@filename: file2.tsx
+
+// Should not elide React import
+import * as React from 'react';
+import {MyClass} from './file1';
+
+<MyClass />;
diff --git a/tests/cases/conformance/jsx/tsxElementResolution7.jsx b/tests/cases/conformance/jsx/tsxElementResolution7.jsx
deleted file mode 100644
index e95505539ab..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution7.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-var my;
-(function (my) {
-})(my || (my = {}));
-// OK
-<my.div n='x'/>;
-// Error
-<my.other />;
-var q;
-(function (q) {
-    // OK
-    <mine.div n='x'/>;
-    // Error
-    <mine.non />;
-})(q || (q = {}));
diff --git a/tests/cases/conformance/jsx/tsxElementResolution8.jsx b/tests/cases/conformance/jsx/tsxElementResolution8.jsx
deleted file mode 100644
index e0f95dc6d22..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution8.jsx
+++ /dev/null
@@ -1,15 +0,0 @@
-// Error
-var div = 3;
-<div />;
-// OK
-function fact() { return null; }
-<fact />;
-// Error
-function fnum() { return 42; }
-<fnum />;
-var obj1;
-<obj1 />; // OK, prefer construct signatures
-var obj2;
-<obj2 />; // Error
-var obj3;
-<obj3 />; // Error
diff --git a/tests/cases/conformance/jsx/tsxElementResolution9.jsx b/tests/cases/conformance/jsx/tsxElementResolution9.jsx
deleted file mode 100644
index 2b62d86eac5..00000000000
--- a/tests/cases/conformance/jsx/tsxElementResolution9.jsx
+++ /dev/null
@@ -1,6 +0,0 @@
-var obj1;
-<obj1 />; // Error, return type is not an object type
-var obj2;
-<obj2 />; // Error, return type is not an object type
-var obj3;
-<obj3 x={42}/>; // OK
diff --git a/tests/cases/conformance/jsx/tsxEmit1.jsx b/tests/cases/conformance/jsx/tsxEmit1.jsx
deleted file mode 100644
index 45ca6e2469f..00000000000
--- a/tests/cases/conformance/jsx/tsxEmit1.jsx
+++ /dev/null
@@ -1,34 +0,0 @@
-var p;
-/*
-var selfClosed1 = <div />;
-var selfClosed2 = <div x="1" />;
-var selfClosed3 = <div x='1' />;
-var selfClosed4 = <div x="1" y='0' />;
-var selfClosed5 = <div x={0} y='0' />;
-var selfClosed6 = <div x={"1"} y='0' />;
-var selfClosed7 = <div x={p} y='p' />;
-
-var openClosed1 = <div></div>;
-var openClosed2 = <div n='m'>foo</div>;
-var openClosed3 = <div n='m'>{p}</div>;
-var openClosed4 = <div n='m'>{p < p}</div>;
-var openClosed5 = <div n='m'>{p > p}</div>;
-*/
-var SomeClass = (function () {
-    function SomeClass() {
-    }
-    SomeClass.prototype.f = function () {
-        var _this = this;
-        var rewrites1 = <div>{function () { return _this; }}</div>;
-        var rewrites4 = <div a={function () { return _this; }}></div>;
-    };
-    return SomeClass;
-})();
-/*
-var q = () => this;
-var rewrites2 = <div>{[p, ...p, p]}</div>;
-var rewrites3 = <div>{{p}}</div>;
-
-var rewrites5 = <div a={[p, ...p, p]}></div>;
-var rewrites6 = <div a={{p}}></div>;
-*/
diff --git a/tests/cases/conformance/jsx/tsxEmit3.jsx b/tests/cases/conformance/jsx/tsxEmit3.jsx
deleted file mode 100644
index 7c979051d00..00000000000
--- a/tests/cases/conformance/jsx/tsxEmit3.jsx
+++ /dev/null
@@ -1,41 +0,0 @@
-var M;
-(function (M) {
-    var Foo = (function () {
-        function Foo() {
-        }
-        return Foo;
-    })();
-    M.Foo = Foo;
-    var S;
-    (function (S) {
-        var Bar = (function () {
-            function Bar() {
-            }
-            return Bar;
-        })();
-        S.Bar = Bar;
-    })(S = M.S || (M.S = {}));
-})(M || (M = {}));
-var M;
-(function (M) {
-    // Emit M.Foo
-    M.Foo, <M.Foo />;
-    var S;
-    (function (S) {
-        // Emit M.Foo
-        M.Foo, <M.Foo />;
-        // Emit S.Bar
-        S.Bar, <S.Bar />;
-    })(S = M.S || (M.S = {}));
-})(M || (M = {}));
-var M;
-(function (M) {
-    // Emit M.S.Bar
-    M.S.Bar, <M.S.Bar />;
-})(M || (M = {}));
-var M;
-(function (M_1) {
-    var M = 100;
-    // Emit M_1.Foo
-    M_1.Foo, <M_1.Foo />;
-})(M || (M = {}));
diff --git a/tests/cases/conformance/jsx/tsxReactEmit1.tsx b/tests/cases/conformance/jsx/tsxReactEmit1.tsx
index b8f14b0ba22..15ece4153a8 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit1.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit1.tsx
@@ -6,6 +6,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p;
 var selfClosed1 = <div />;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit2.tsx b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
index 39a78a7da87..96ab8c6046b 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit2.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
@@ -6,6 +6,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p1, p2, p3;
 var spreads1 = <div {...p1}>{p2}</div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit3.tsx b/tests/cases/conformance/jsx/tsxReactEmit3.tsx
index eb63be44f3b..12adcd3c2b6 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit3.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit3.tsx
@@ -2,6 +2,7 @@
 //@filename: test.tsx
 
 declare module JSX { interface Element { } }
+declare var React: any;
 
 declare var Foo, Bar, baz;
 
diff --git a/tests/cases/conformance/jsx/tsxReactEmit4.tsx b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
index f007c35c24a..a032a5a3985 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit4.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
@@ -6,6 +6,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 var p;
 var openClosed1 = <div>
diff --git a/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx b/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
index 38c966fa700..34fd158eab1 100644
--- a/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
@@ -6,6 +6,7 @@ declare module JSX {
 		[s: string]: any;
 	}
 }
+declare var React: any;
 
 // THIS FILE HAS TEST-SIGNIFICANT LEADING/TRAILING
 // WHITESPACE, DO NOT RUN 'FORMAT DOCUMENT' ON IT