diff --git a/lib/rules/jsx-sort-props.js b/lib/rules/jsx-sort-props.js
index ccb7cec206..aa9a598f85 100644
--- a/lib/rules/jsx-sort-props.js
+++ b/lib/rules/jsx-sort-props.js
@@ -342,7 +342,7 @@ module.exports = {
             }
           }
 
-          if (!noSortAlphabetically && currentPropName < previousPropName) {
+          if (!noSortAlphabetically && previousPropName.localeCompare(currentPropName) > 0) {
             context.report({
               node: decl.name,
               message: 'Props should be sorted alphabetically',
diff --git a/tests/lib/rules/jsx-sort-props.js b/tests/lib/rules/jsx-sort-props.js
index f044557b0e..4a58b1ca43 100644
--- a/tests/lib/rules/jsx-sort-props.js
+++ b/tests/lib/rules/jsx-sort-props.js
@@ -109,7 +109,11 @@ ruleTester.run('jsx-sort-props', rule, {
     {code: '<App a="c" b="b" c="a" />;'},
     {code: '<App {...this.props} a="c" b="b" c="a" />;'},
     {code: '<App c="a" {...this.props} a="c" b="b" />;'},
-    {code: '<App A a />;'},
+    {code: '<App a A />;'},
+    {code: '<App aa aB />;'},
+    {code: '<App aA aB />;'},
+    {code: '<App aaa aB />;'},
+    {code: '<App a aa aB />;'},
     // Ignoring case
     {code: '<App a A />;', options: ignoreCaseArgs},
     {code: '<App a B c />;', options: ignoreCaseArgs},
@@ -165,6 +169,31 @@ ruleTester.run('jsx-sort-props', rule, {
       errors: [expectedError],
       output: '<App a b />;'
     },
+    {
+      code: '<App aB a />;',
+      errors: [expectedError],
+      output: '<App a aB />;'
+    },
+    {
+      code: '<App A a />;',
+      errors: [expectedError],
+      output: '<App a A />;'
+    },
+    {
+      code: '<App aB aA />;',
+      errors: [expectedError],
+      output: '<App aA aB />;'
+    },
+    {
+      code: '<App aaB aA />;',
+      errors: [expectedError],
+      output: '<App aA aaB />;'
+    },
+    {
+      code: '<App aaB aaa aA a />;',
+      errors: [expectedError, expectedError, expectedError],
+      output: '<App a aA aaa aaB />;'
+    },
     {
       code: '<App {...this.props} b a />;',
       errors: [expectedError],
@@ -175,11 +204,6 @@ ruleTester.run('jsx-sort-props', rule, {
       errors: [expectedError],
       output: '<App c {...this.props} a b />;'
     },
-    {
-      code: '<App a A />;',
-      errors: [expectedError],
-      output: '<App a A />;'
-    },
     {
       code: '<App B a />;',
       options: ignoreCaseArgs,