diff --git a/tests/cases/compiler/jsxFragment.tsx b/tests/cases/compiler/jsxFragment.tsx
deleted file mode 100644
index 82e093327be..00000000000
--- a/tests/cases/compiler/jsxFragment.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-//@jsx: react
-
-declare var React: any;
-<div></div>;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx b/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx
new file mode 100644
index 00000000000..65dfc720003
--- /dev/null
+++ b/tests/cases/conformance/jsx/checkJsxChildrenProperty14.tsx
@@ -0,0 +1,48 @@
+// @filename: file.tsx
+// @jsx: preserve
+// @noLib: true
+// @skipLibCheck: true
+// @libFiles: react.d.ts,lib.d.ts
+
+import React = require('react');
+
+interface Prop {
+    a: number,
+    b: string,
+    children: JSX.Element | JSX.Element[];
+}
+
+class Button extends React.Component<any, any> {
+    render() {
+        return (<div>My Button</div>)
+    }
+}
+
+function AnotherButton(p: any) {
+    return <h1>Just Another Button</h1>;
+}
+
+function Comp(p: Prop) {
+    return <div>{p.b}</div>;
+}
+
+// OK
+let k1 = <Comp a={10} b="hi"><></><Button /><AnotherButton /></Comp>;
+let k2 = <Comp a={10} b="hi"><><Button /></><AnotherButton /></Comp>;
+let k3 = <Comp a={10} b="hi"><><Button /><AnotherButton /></></Comp>;
+
+interface SingleChildProp {
+    a: number,
+    b: string,
+    children: JSX.Element;
+}
+
+function SingleChildComp(p: SingleChildProp) {
+    return <div>{p.b}</div>;
+}
+
+// OK
+let k4 = <SingleChildComp a={10} b="hi"><><Button /><AnotherButton /></></SingleChildComp>;
+
+// Errors
+let k5 = <SingleChildComp a={10} b="hi"><></><Button /><AnotherButton /></SingleChildComp>;
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxFragmentErrors.tsx b/tests/cases/conformance/jsx/tsxFragmentErrors.tsx
new file mode 100644
index 00000000000..7806a576fed
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxFragmentErrors.tsx
@@ -0,0 +1,14 @@
+//@filename: file.tsx
+//@jsx: react
+
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+declare var React: any;
+
+<>hi</div> // Error
+
+<>eof   // Error
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx b/tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx
new file mode 100644
index 00000000000..5f4da955c36
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxFragmentPreserveEmit.tsx
@@ -0,0 +1,17 @@
+//@filename: file.tsx
+//@jsx: preserve
+
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+declare var React: any;
+
+<></>; // no whitespace
+<    ></   >; // lots of whitespace
+< /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
+<>hi</>; // text inside
+<><span>hi</span><div>bye</div></>; // children
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
\ No newline at end of file
diff --git a/tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx b/tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx
new file mode 100644
index 00000000000..15f4d290cbd
--- /dev/null
+++ b/tests/cases/conformance/jsx/tsxFragmentReactEmit.tsx
@@ -0,0 +1,17 @@
+//@filename: file.tsx
+//@jsx: react
+
+declare module JSX {
+	interface Element { }
+	interface IntrinsicElements {
+		[s: string]: any;
+	}
+}
+declare var React: any;
+
+<></>; // no whitespace
+<    ></   >; // lots of whitespace
+< /*starting wrap*/ ></ /*ending wrap*/>; // comments in the tags
+<>hi</>; // text inside
+<><span>hi</span><div>bye</div></>; // children
+<><span>1</span><><span>2.1</span><span>2.2</span></><span>3</span></>; // nested fragments
\ No newline at end of file