diff -r 000000000000 -r 6474c204b198 js/src/jit-test/tests/basic/maxConvertAllArgs.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/js/src/jit-test/tests/basic/maxConvertAllArgs.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,11 @@
+//Bug 818620
+
+load(libdir + "asserts.js");
+
+assertThrowsInstanceOf(function () {
+    Math.max(NaN, { valueOf: function () { throw new Error() } });
+}, Error);
+
+assertThrowsInstanceOf(function () {
+    Math.min(NaN, { valueOf: function () { throw new Error() } });
+}, Error);