diff --git a/generators/javascript/lists.js b/generators/javascript/lists.js
index aa817f96f..4bb6aac20 100644
--- a/generators/javascript/lists.js
+++ b/generators/javascript/lists.js
@@ -314,10 +314,10 @@ Blockly.JavaScript['lists_sort'] = function(block) {
       '    "NUMERIC": function(a, b) {',
       '        return parseFloat(a) - parseFloat(b); },',
       '    "TEXT": function(a, b) {',
-      '        return a.toString().localeCompare(b.toString(), "en"); },',
+      '        return a.toString() > b.toString() ? 1 : -1; },',
       '    "IGNORE_CASE": function(a, b) {',
-      '        return a.toString().localeCompare(b.toString(), "en",',
-      '          {"sensitivity": "base"}); },',
+      '        return a.toString().toLowerCase() > ' +
+      'b.toString().toLowerCase() ? 1 : -1; },',
       '  };',
       '  var compare = compareFuncs[type];',
       '  return function(a, b) { return compare(a, b) * direction; }',
diff --git a/tests/generators/index.html b/tests/generators/index.html
index f10e5493a..5ae75e553 100644
--- a/tests/generators/index.html
+++ b/tests/generators/index.html
@@ -77,8 +77,15 @@ var workspace = null;
 
 function start() {
   workspace = Blockly.inject('blocklyDiv',
-      {media: '../../media/',
-       toolbox: document.getElementById('toolbox')});
+      {grid:
+         {spacing: 25,
+          length: 3,
+          colour: '#ccc',
+          snap: true},
+       media: '../../media/',
+       toolbox: document.getElementById('toolbox'),
+       zoom: {controls: true, wheel: true}
+       });
 }
 
 function loadXml() {
diff --git a/tests/generators/lists.xml b/tests/generators/lists.xml
index 374185fa6..d803a14ad 100644
--- a/tests/generators/lists.xml
+++ b/tests/generators/lists.xml
@@ -2299,7 +2299,7 @@
                 </value>
                 <value name="ADD1">
                   <block type="text">
-                    <field name="TEXT">Klingon</field>
+                    <field name="TEXT">klingon</field>
                   </block>
                 </value>
                 <value name="ADD2">
@@ -2329,12 +2329,12 @@
                 </value>
                 <value name="ADD1">
                   <block type="text">
-                    <field name="TEXT">Klingon</field>
+                    <field name="TEXT">Vulcan</field>
                   </block>
                 </value>
                 <value name="ADD2">
                   <block type="text">
-                    <field name="TEXT">Vulcan</field>
+                    <field name="TEXT">klingon</field>
                   </block>
                 </value>
               </block>
@@ -2356,15 +2356,15 @@
             <field name="DIRECTION">1</field>
             <value name="LIST">
               <block type="lists_create_with" inline="false">
-                <mutation items="4"></mutation>
+                <mutation items="3"></mutation>
                 <value name="ADD0">
                   <block type="text">
-                    <field name="TEXT">borg</field>
+                    <field name="TEXT">Vulcan</field>
                   </block>
                 </value>
                 <value name="ADD1">
                   <block type="text">
-                    <field name="TEXT">Klingon</field>
+                    <field name="TEXT">klingon</field>
                   </block>
                 </value>
                 <value name="ADD2">
@@ -2372,11 +2372,6 @@
                     <field name="TEXT">Borg</field>
                   </block>
                 </value>
-                <value name="ADD3">
-                  <block type="text">
-                    <field name="TEXT">Vulcan</field>
-                  </block>
-                </value>
               </block>
             </value>
           </block>
@@ -2391,23 +2386,18 @@
             </value>
             <value name="EXPECTED">
               <block type="lists_create_with" inline="false">
-                <mutation items="4"></mutation>
+                <mutation items="3"></mutation>
                 <value name="ADD0">
-                  <block type="text">
-                    <field name="TEXT">borg</field>
-                  </block>
-                </value>
-                <value name="ADD1">
                   <block type="text">
                     <field name="TEXT">Borg</field>
                   </block>
                 </value>
-                <value name="ADD2">
+                <value name="ADD1">
                   <block type="text">
-                    <field name="TEXT">Klingon</field>
+                    <field name="TEXT">klingon</field>
                   </block>
                 </value>
-                <value name="ADD3">
+                <value name="ADD2">
                   <block type="text">
                     <field name="TEXT">Vulcan</field>
                   </block>
@@ -2433,18 +2423,18 @@
               <block type="lists_create_with" inline="false">
                 <mutation items="3"></mutation>
                 <value name="ADD0">
-                  <block type="text">
-                    <field name="TEXT">0-Borg</field>
+                  <block type="math_number">
+                    <field name="NUM">8</field>
                   </block>
                 </value>
                 <value name="ADD1">
-                  <block type="text">
-                    <field name="TEXT">Vulcan</field>
+                  <block type="math_number">
+                    <field name="NUM">18</field>
                   </block>
                 </value>
                 <value name="ADD2">
-                  <block type="text">
-                    <field name="TEXT">1-Klingon</field>
+                  <block type="math_number">
+                    <field name="NUM">-1</field>
                   </block>
                 </value>
               </block>
@@ -2463,18 +2453,18 @@
               <block type="lists_create_with" inline="false">
                 <mutation items="3"></mutation>
                 <value name="ADD0">
-                  <block type="text">
-                    <field name="TEXT">Vulcan</field>
+                  <block type="math_number">
+                    <field name="NUM">18</field>
                   </block>
                 </value>
                 <value name="ADD1">
-                  <block type="text">
-                    <field name="TEXT">1-Klingon</field>
+                  <block type="math_number">
+                    <field name="NUM">8</field>
                   </block>
                 </value>
                 <value name="ADD2">
-                  <block type="text">
-                    <field name="TEXT">0-Borg</field>
+                  <block type="math_number">
+                    <field name="NUM">-1</field>
                   </block>
                 </value>
               </block>
@@ -2484,4 +2474,4 @@
       </block>
     </statement>
   </block>
-</xml>
\ No newline at end of file
+</xml>