diff --git a/test/built-ins/Math/max/S15.8.2.11_A3.js b/test/built-ins/Math/max/S15.8.2.11_A3.js
deleted file mode 100644
index ea35d1fcf58bd58309de79cdae46d5acb288b81d..0000000000000000000000000000000000000000
--- a/test/built-ins/Math/max/S15.8.2.11_A3.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: +0 is considered to be larger than -0
-es5id: 15.8.2.11_A3
-description: Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to +0
----*/
-
-// CHECK#1
-if (Math.max(-0, +0) !== +0)
-{
-	$ERROR("#1: 'Math.max(-0, +0) !== +0'");
-}
-
-// CHECK#1
-if (Math.max(+0, -0) !== +0)
-{
-	$ERROR("#2: 'Math.max(+0, -0) !== +0'");
-}
diff --git a/test/built-ins/Math/max/zeros.js b/test/built-ins/Math/max/zeros.js
new file mode 100644
index 0000000000000000000000000000000000000000..8be2cf7f607a6b3351925e9ffc0db5dd04c22524
--- /dev/null
+++ b/test/built-ins/Math/max/zeros.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2016 The V8 Project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-math.max
+es6id: 20.2.2.24
+description: >
+  +0 is considered to be larger than -0
+info: |
+  Math.max ( value1, value2 , …values )
+
+  The comparison of values to determine the largest value is done using the
+  Abstract Relational Comparison algorithm except that +0 is considered to be
+  larger than -0.
+---*/
+
+assert.sameValue(Math.max(0, 0), 0, "(0, 0)");
+assert.sameValue(Math.max(-0, -0), -0, "(-0, -0)");
+assert.sameValue(Math.max(0, -0), 0, "(0, -0)");
+assert.sameValue(Math.max(-0, 0), 0, "(-0, 0)");
+assert.sameValue(Math.max(0, 0, -0), 0, "(0, 0, -0)");
diff --git a/test/built-ins/Math/min/S15.8.2.12_A3.js b/test/built-ins/Math/min/S15.8.2.12_A3.js
deleted file mode 100644
index 7b6049fb1456848a11feef0b155189df56edd882..0000000000000000000000000000000000000000
--- a/test/built-ins/Math/min/S15.8.2.12_A3.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2009 the Sputnik authors.  All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-info: +0 is considered to be larger than -0
-es5id: 15.8.2.12_A3
-description: Checking if Math.max(-0,+0) and Math.max(+0,-0) equals to -0
----*/
-
-// CHECK#1
-if (Math.max(-0, +0) !== -0)
-{
-	$ERROR("#1: 'Math.max(-0, +0) !== -0'");
-}
-
-// CHECK#1
-if (Math.max(+0, -0) !== -0)
-{
-	$ERROR("#2: 'Math.max(+0, -0) !== -0'");
-}
diff --git a/test/built-ins/Math/min/zeros.js b/test/built-ins/Math/min/zeros.js
new file mode 100644
index 0000000000000000000000000000000000000000..4889fdff94dab866e179ecf9eea5cf8fbb93f6e6
--- /dev/null
+++ b/test/built-ins/Math/min/zeros.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2016 The V8 Project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-math.min
+es6id: 20.2.2.25
+description: >
+  +0 is considered to be larger than -0
+info: |
+  Math.min ( value1, value2 , …values )
+
+  The comparison of values to determine the smallest value is done using the
+  Abstract Relational Comparison algorithm except that +0 is considered to be
+  larger than -0.
+---*/
+
+assert.sameValue(Math.min(0, 0), 0, "(0, 0)");
+assert.sameValue(Math.min(-0, -0), -0, "(-0, -0)");
+assert.sameValue(Math.min(0, -0), -0, "(0, -0)");
+assert.sameValue(Math.min(-0, 0), -0, "(-0, 0)");
+assert.sameValue(Math.min(0, 0, -0), -0, "(0, 0, -0)");