diff --git a/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx b/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
index dc0c2fed8d6..9a9e0d8245d 100644
--- a/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
+++ b/tests/cases/conformance/jsx/tsxAttributeResolution3.tsx
@@ -36,6 +36,6 @@ var obj5 = { x: 32, y: 32 };
 var obj6 = { x: 'ok', y: 32, extra: 100 };
 <test1 {...obj6} />
 
-// Error
+// OK (spread override)
 var obj7 = { x: 'foo' };
 <test1 x={32} {...obj7} />
diff --git a/tests/cases/conformance/jsx/tsxElementResolution12.tsx b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
index a5d8f2d812b..a4b47336ef8 100644
--- a/tests/cases/conformance/jsx/tsxElementResolution12.tsx
+++ b/tests/cases/conformance/jsx/tsxElementResolution12.tsx
@@ -15,7 +15,7 @@ var Obj1: Obj1type;
 interface Obj2type {
 	new(n: string): { q?: number; pr: any };
 }
-var obj2: Obj2type;
+var Obj2: Obj2type;
 <Obj2 x={10} />; // OK
 
 interface Obj3type {
diff --git a/tests/cases/conformance/jsx/tsxEmit2.tsx b/tests/cases/conformance/jsx/tsxEmit2.tsx
index 24f51a4583d..8d90fccdcd1 100644
--- a/tests/cases/conformance/jsx/tsxEmit2.tsx
+++ b/tests/cases/conformance/jsx/tsxEmit2.tsx
@@ -7,7 +7,7 @@ declare module JSX {
 	}
 }
 
-var p1, p2, p3;
+var p1: any, p2: any, p3: any;
 var spreads1 = <div {...p1}>{p2}</div>;
 var spreads2 = <div {...p1}>{p2}</div>;
 var spreads3 = <div x={p3} {...p1}>{p2}</div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit2.tsx b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
index 96ab8c6046b..762b36b8432 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit2.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit2.tsx
@@ -8,7 +8,7 @@ declare module JSX {
 }
 declare var React: any;
 
-var p1, p2, p3;
+var p1: any, p2: any, p3: any;
 var spreads1 = <div {...p1}>{p2}</div>;
 var spreads2 = <div {...p1}>{p2}</div>;
 var spreads3 = <div x={p3} {...p1}>{p2}</div>;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit4.tsx b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
index a032a5a3985..3fbff0975a5 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit4.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit4.tsx
@@ -8,7 +8,7 @@ declare module JSX {
 }
 declare var React: any;
 
-var p;
+var p: any;
 var openClosed1 = <div>
 
    {blah}
diff --git a/tests/cases/conformance/jsx/tsxReactEmit5.tsx b/tests/cases/conformance/jsx/tsxReactEmit5.tsx
index c961a23ecfc..f8787eb4aa3 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit5.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit5.tsx
@@ -16,5 +16,5 @@ export var React;
 import {React} from "./test";
 // Should emit test_1.React.createElement
 //  and React.__spread
-var foo;
+var foo: any;
 var spread1 = <div x='' {...foo} y='' />;
diff --git a/tests/cases/conformance/jsx/tsxReactEmit6.tsx b/tests/cases/conformance/jsx/tsxReactEmit6.tsx
index 0e8c772a3f1..abc41a690d4 100644
--- a/tests/cases/conformance/jsx/tsxReactEmit6.tsx
+++ b/tests/cases/conformance/jsx/tsxReactEmit6.tsx
@@ -17,7 +17,7 @@ namespace M {
 namespace M {
 	// Should emit M.React.createElement
 	//  and M.React.__spread
-	var foo;
+	var foo: any;
 	var spread1 = <div x='' {...foo} y='' />;
 
 	// Quotes
diff --git a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
index 5d64d22c757..6d7ffa21e0b 100644
--- a/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
+++ b/tests/cases/conformance/jsx/tsxStatelessFunctionComponents1.tsx
@@ -9,17 +9,28 @@ function Greet(x: {name: string}) {
 function Meet({name = 'world'}) {
 	return <div>Hello, {name}</div>;
 }
+function MeetAndGreet(k: {"prop-name": string}) {
+	return <div>Hi Hi</div>;
+}
 
 // OK
 let a = <Greet name='world' />;
+let a1 = <Greet name='world' extra-prop />;
 // Error
 let b = <Greet naaame='world' />;
 
 // OK
 let c = <Meet />;
+let c1 = <Meet extra-prop/>;
 // OK
 let d = <Meet name='me' />;
 // Error
 let e = <Meet name={42} />;
 // Error
 let f = <Meet naaaaaaame='no' />;
+
+// OK
+let g = <MeetAndGreet prop-name="Bob" />;
+// Error
+let h = <MeetAndGreet extra-prop-name="World" />;
+