diff --git a/tests/mocha/field_angle_test.js b/tests/mocha/field_angle_test.js
index 75a34d2b0..93e3dc870 100644
--- a/tests/mocha/field_angle_test.js
+++ b/tests/mocha/field_angle_test.js
@@ -67,6 +67,14 @@ suite('Angle Fields', function() {
       var angleField = new Blockly.FieldAngle(362);
       assertValue(angleField, 2);
     });
+    test('Infinity', function() {
+      var angleField = new Blockly.FieldAngle(Infinity);
+      assertValueDefault(angleField);
+    });
+    test('Negative Infinity String', function() {
+      var angleField = new Blockly.FieldAngle('-Infinity');
+      assertValueDefault(angleField);
+    });
   });
   suite('fromJson', function() {
     test('Empty', function() {
@@ -105,6 +113,14 @@ suite('Angle Fields', function() {
       var angleField = Blockly.FieldAngle.fromJson({ angle:362 });
       assertValue(angleField, 2);
     });
+    test('Infinity', function() {
+      var angleField = Blockly.FieldAngle.fromJson({ angle:Infinity });
+      assertValueDefault(angleField);
+    });
+    test('Negative Infinity String', function() {
+      var angleField = Blockly.FieldAngle.fromJson({ angle:'-Infinity' });
+      assertValueDefault(angleField);
+    });
   });
   suite('setValue', function() {
     suite('Empty -> New Value', function() {
@@ -147,6 +163,14 @@ suite('Angle Fields', function() {
         this.angleField.setValue(362);
         assertValue(this.angleField, 2);
       });
+      test('Infinity', function() {
+        this.angleField.setValue(Infinity);
+        assertValueDefault(this.angleField);
+      });
+      test('Negative Infinity String', function() {
+        this.angleField.setValue('-Infinity');
+        assertValueDefault(this.angleField);
+      });
     });
     suite('Value -> New Value', function() {
       setup(function() {
@@ -188,6 +212,14 @@ suite('Angle Fields', function() {
         this.angleField.setValue(362);
         assertValue(this.angleField, 2);
       });
+      test('Infinity', function() {
+        this.angleField.setValue(Infinity);
+        assertValue(this.angleField, 1);
+      });
+      test('Negative Infinity String', function() {
+        this.angleField.setValue('-Infinity');
+        assertValue(this.angleField, 1);
+      });
     });
   });
   suite('Validators', function() {
diff --git a/tests/mocha/field_number_test.js b/tests/mocha/field_number_test.js
index c41fb33a2..c7d68cdf5 100644
--- a/tests/mocha/field_number_test.js
+++ b/tests/mocha/field_number_test.js
@@ -83,6 +83,14 @@ suite('Number Fields', function() {
       var numberField = createNumberFieldSameValuesConstructor('1.5');
       assertNumberFieldSameValues(numberField, 1.5);
     });
+    test('Infinity', function() {
+      var numberField = createNumberFieldSameValuesConstructor('Infinity');
+      assertNumberFieldSameValues(numberField, Infinity);
+    });
+    test('Negative Infinity String', function() {
+      var numberField = createNumberFieldSameValuesConstructor('-Infinity');
+      assertNumberFieldSameValues(numberField, -Infinity);
+    });
   });
   suite('fromJson', function() {
     test('Empty', function() {
@@ -117,6 +125,14 @@ suite('Number Fields', function() {
       var numberField = createNumberFieldSameValuesJson('1.5');
       assertNumberFieldSameValues(numberField, 1.5);
     });
+    test('Infinity', function() {
+      var numberField = createNumberFieldSameValuesJson('Infinity');
+      assertNumberFieldSameValues(numberField, Infinity);
+    });
+    test('Negative Infinity String', function() {
+      var numberField = createNumberFieldSameValuesJson('-Infinity');
+      assertNumberFieldSameValues(numberField, -Infinity);
+    });
   });
   suite('setValue', function() {
     suite('Value Types', function() {
@@ -156,6 +172,14 @@ suite('Number Fields', function() {
           this.numberField.setValue('2.5');
           assertValue(this.numberField, 2.5);
         });
+        test('Infinity', function() {
+          this.numberField.setValue(Infinity);
+          assertValue(this.numberField, Infinity);
+        });
+        test('Negative Infinity String', function() {
+          this.numberField.setValue('-Infinity');
+          assertValue(this.numberField, -Infinity);
+        });
       });
       suite('Value -> New Value', function() {
         setup(function() {
@@ -193,6 +217,14 @@ suite('Number Fields', function() {
           this.numberField.setValue('2.5');
           assertValue(this.numberField, 2.5);
         });
+        test('Infinity', function() {
+          this.numberField.setValue(Infinity);
+          assertValue(this.numberField, Infinity);
+        });
+        test('Negative Infinity String', function() {
+          this.numberField.setValue('-Infinity');
+          assertValue(this.numberField, -Infinity);
+        });
       });
     });
     suite('Constraints', function() {