diff --git a/lib/rules/jsx-curly-brace-presence.js b/lib/rules/jsx-curly-brace-presence.js
index 741aad2572..3865e273f9 100755
--- a/lib/rules/jsx-curly-brace-presence.js
+++ b/lib/rules/jsx-curly-brace-presence.js
@@ -229,13 +229,7 @@ module.exports = {
       const childrenExcludingWhitespaceLiteral = children.filter(child => !isWhiteSpaceLiteral(child));
       const adjSiblings = getAdjacentSiblings(node, childrenExcludingWhitespaceLiteral);
 
-      for (let i = 0; i < adjSiblings.length; i++) {
-        const currentChild = adjSiblings[i];
-        if (currentChild.type && currentChild.type === 'JSXExpressionContainer') {
-          return true;
-        }
-      }
-      return false;
+      return adjSiblings.some(x => x.type && x.type === 'JSXExpressionContainer');
     }
 
     function shouldCheckForUnnecessaryCurly(parent, node, config) {
diff --git a/tests/lib/rules/jsx-curly-brace-presence.js b/tests/lib/rules/jsx-curly-brace-presence.js
index 7c7c5fc478..baeff71ab4 100755
--- a/tests/lib/rules/jsx-curly-brace-presence.js
+++ b/tests/lib/rules/jsx-curly-brace-presence.js
@@ -390,7 +390,11 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       `,
       parser: parsers.BABEL_ESLINT,
       options: [{children: 'never'}],
-      errors: 3
+      errors: [
+        {message: unnecessaryCurlyMessage},
+        {message: unnecessaryCurlyMessage},
+        {message: unnecessaryCurlyMessage}
+      ]
     },
     {
       code: `
@@ -415,7 +419,7 @@ ruleTester.run('jsx-curly-brace-presence', rule, {
       `,
       parser: parsers.BABEL_ESLINT,
       options: [{children: 'never'}],
-      errors: 2
+      errors: [{message: unnecessaryCurlyMessage}, {message: unnecessaryCurlyMessage}]
     },
     {
       code: `<MyComponent prop='bar'>foo</MyComponent>`,