diff --git a/src/language-js/printer-estree.js b/src/language-js/printer-estree.js
index fd52d8d2..447c012a 100644
--- a/src/language-js/printer-estree.js
+++ b/src/language-js/printer-estree.js
@@ -4477,6 +4477,7 @@ function maybeWrapJSXElementInParens(path, elem) {
 
   const NO_WRAP_PARENTS = {
     ArrayExpression: true,
+    JSXAttribute: true,
     JSXElement: true,
     JSXExpressionContainer: true,
     JSXFragment: true,
diff --git a/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap b/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap
new file mode 100644
index 00000000..c1ec5a95
--- /dev/null
+++ b/tests/jsx-attr-element/__snapshots__/jsfmt.spec.js.snap
@@ -0,0 +1,20 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`attr-element.js 1`] = `
+<Foo prop=<Bar><Baz /></Bar> />;
+<Foo prop=<><Bar><Baz /></Bar></> />;
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+<Foo
+  prop=<Bar>
+    <Baz />
+  </Bar>
+/>;
+<Foo
+  prop=<>
+    <Bar>
+      <Baz />
+    </Bar>
+  </>
+/>;
+
+`;
diff --git a/tests/jsx-attr-element/attr-element.js b/tests/jsx-attr-element/attr-element.js
new file mode 100644
index 00000000..f31bd230
--- /dev/null
+++ b/tests/jsx-attr-element/attr-element.js
@@ -0,0 +1,2 @@
+<Foo prop=<Bar><Baz /></Bar> />;
+<Foo prop=<><Bar><Baz /></Bar></> />;
diff --git a/tests/jsx-attr-element/jsfmt.spec.js b/tests/jsx-attr-element/jsfmt.spec.js
new file mode 100644
index 00000000..ad02d22b
--- /dev/null
+++ b/tests/jsx-attr-element/jsfmt.spec.js
@@ -0,0 +1,2 @@
+// Flow and TypeScript don't support JSX elements as attribute values
+run_spec(__dirname, ["babylon"]);