diff --git a/test/built-ins/Number/string-octal-literal-invald.js b/test/built-ins/Number/string-octal-literal-invald.js
new file mode 100644
index 0000000000000000000000000000000000000000..f9621dfbbf5aa19868b51e57c31ffb7efe5737f4
--- /dev/null
+++ b/test/built-ins/Number/string-octal-literal-invald.js
@@ -0,0 +1,20 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 20.1.1.1
+description: Invalid octal literals yield NaN
+info: >
+    BinaryIntegerLiteral ::
+      0b BinaryDigits
+      0B BinaryDigits
+    BinaryDigits ::
+      BinaryDigit
+      BinaryDigits BinaryDigit
+    BinaryDigit :: one of
+      0 1
+---*/
+
+assert.sameValue(Number('0o8'), NaN, 'invalid digit');
+assert.sameValue(Number('00o0'), NaN, 'leading zero');
+assert.sameValue(Number('0o'), NaN, 'omitted digits');
diff --git a/test/built-ins/Number/string-octal-literal.js b/test/built-ins/Number/string-octal-literal.js
new file mode 100644
index 0000000000000000000000000000000000000000..365fb177409588ab2a2e298fd51f4624d3685d8c
--- /dev/null
+++ b/test/built-ins/Number/string-octal-literal.js
@@ -0,0 +1,59 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 20.1.1.1
+description: Mathematical value of valid octal integer literals
+info: >
+    20.1.1.1 Number ( [ value ] )
+
+    When Number is called with argument number, the following steps are taken:
+
+    1. If no arguments were passed to this function invocation, let n be +0.
+    2. Else, let n be ToNumber(value).
+
+    [...]
+
+    7.1.3.1 ToNumber Applied to the String Type
+
+    All grammar symbols not explicitly defined above have the definitions used
+    in the Lexical Grammar for numeric literals (11.8.3)
+
+    [...]
+
+    The MV of OctalIntegerLiteral :: 0o OctalDigits is the MV of OctalDigits.
+    The MV of OctalIntegerLiteral :: 0O OctalDigits is the MV of OctalDigits.
+    The MV of OctalDigits :: OctalDigit is the MV of OctalDigit.
+    The MV of OctalDigits :: OctalDigits OctalDigit is (the MV of OctalDigits ×
+    8) plus the MV of OctalDigit.
+---*/
+
+assert.sameValue(Number('0o0'), 0, 'lower-case head');
+assert.sameValue(Number('0O0'), 0, 'upper-case head');
+assert.sameValue(Number('0o00'), 0, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O00'), 0, 'upper-case head with leading zeros');
+
+assert.sameValue(Number('0o1'), 1, 'lower-case head');
+assert.sameValue(Number('0O1'), 1, 'upper-case head');
+assert.sameValue(Number('0o01'), 1, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O01'), 1, 'upper-case head with leading zeros');
+
+assert.sameValue(Number('0o7'), 7, 'lower-case head');
+assert.sameValue(Number('0O7'), 7, 'upper-case head');
+assert.sameValue(Number('0o07'), 7, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O07'), 7, 'upper-case head with leading zeros');
+
+assert.sameValue(Number('0o10'), 8, 'lower-case head');
+assert.sameValue(Number('0O10'), 8, 'upper-case head');
+assert.sameValue(Number('0o010'), 8, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O010'), 8, 'upper-case head with leading zeros');
+
+assert.sameValue(Number('0o11'), 9, 'lower-case head');
+assert.sameValue(Number('0O11'), 9, 'upper-case head');
+assert.sameValue(Number('0o011'), 9, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O011'), 9, 'upper-case head with leading zeros');
+
+assert.sameValue(Number('0o77'), 63, 'lower-case head');
+assert.sameValue(Number('0O77'), 63, 'upper-case head');
+assert.sameValue(Number('0o077'), 63, 'lower-case head with leading zeros');
+assert.sameValue(Number('0O077'), 63, 'upper-case head with leading zeros');
diff --git a/test/language/literals/numeric/octal-invalid-digit.js b/test/language/literals/numeric/octal-invalid-digit.js
new file mode 100644
index 0000000000000000000000000000000000000000..7823fe6b8c373971334b13dcb8343cc48d83d451
--- /dev/null
+++ b/test/language/literals/numeric/octal-invalid-digit.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 11.8.3
+description: Octal-integer-literal-like sequence containing an invalid digit
+info: >
+    OctalIntegerLiteral ::
+      0o OctalDigits
+      0O OctalDigits
+    OctalDigits ::
+      OctalDigit
+      OctalDigits OctalDigit
+    OctalDigit :: one of
+      0 1 2 3 4 5 6 7
+negative: SyntaxError
+---*/
+
+0o8;
diff --git a/test/language/literals/numeric/octal-invalid-leading.js b/test/language/literals/numeric/octal-invalid-leading.js
new file mode 100644
index 0000000000000000000000000000000000000000..1319a384714539d92c7354b7b8470d15b43c2dbb
--- /dev/null
+++ b/test/language/literals/numeric/octal-invalid-leading.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 11.8.3
+description: Octal-integer-literal-like sequence with a leading 0
+info: >
+    OctalIntegerLiteral ::
+      0o OctalDigits
+      0O OctalDigits
+    OctalDigits ::
+      OctalDigit
+      OctalDigits OctalDigit
+    OctalDigit :: one of
+      0 1 2 3 4 5 6 7
+negative: SyntaxError
+---*/
+
+00o0;
diff --git a/test/language/literals/numeric/octal-invalid-truncated.js b/test/language/literals/numeric/octal-invalid-truncated.js
new file mode 100644
index 0000000000000000000000000000000000000000..1588d062b8358dceac93e61b8ee0b92e49fe1efb
--- /dev/null
+++ b/test/language/literals/numeric/octal-invalid-truncated.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 11.8.3
+description: Octal-integer-literal-like sequence without any digits
+info: >
+    OctalIntegerLiteral ::
+      0o OctalDigits
+      0O OctalDigits
+    OctalDigits ::
+      OctalDigit
+      OctalDigits OctalDigit
+    OctalDigit :: one of
+      0 1 2 3 4 5 6 7
+negative: SyntaxError
+---*/
+
+0b;
diff --git a/test/language/literals/numeric/octal-invalid-unicode.js b/test/language/literals/numeric/octal-invalid-unicode.js
new file mode 100644
index 0000000000000000000000000000000000000000..9be0626abae0cdcf81751b8add7ab00b1c80704d
--- /dev/null
+++ b/test/language/literals/numeric/octal-invalid-unicode.js
@@ -0,0 +1,19 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 11.8.3
+description: Octal-integer-literal-like sequence expressed with unicode escape sequence
+info: >
+    OctalIntegerLiteral ::
+      0o OctalDigits
+      0O OctalDigits
+    OctalDigits ::
+      OctalDigit
+      OctalDigits OctalDigit
+    OctalDigit :: one of
+      0 1 2 3 4 5 6 7
+negative: SyntaxError
+---*/
+
+0\u006f0;
diff --git a/test/language/literals/numeric/octal.js b/test/language/literals/numeric/octal.js
new file mode 100644
index 0000000000000000000000000000000000000000..74be196115936c3d10c316450b6ce3bc33c1347f
--- /dev/null
+++ b/test/language/literals/numeric/octal.js
@@ -0,0 +1,45 @@
+// Copyright (C) 2015 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+es6id: 11.8.3.1
+description: Mathematical value of valid octal integer literals
+info: >
+    The MV of StrNumericLiteral ::: OctalIntegerLiteral is the MV of
+    OctalIntegerLiteral.
+    The MV of OctalIntegerLiteral :: 0o OctalDigits is the MV of OctalDigits.
+    The MV of OctalIntegerLiteral :: 0O OctalDigits is the MV of OctalDigits.
+    The MV of OctalDigits :: OctalDigit is the MV of OctalDigit.
+    The MV of OctalDigits :: OctalDigits OctalDigit is (the MV of OctalDigits ×
+    8) plus the MV of OctalDigit.
+---*/
+
+assert.sameValue(0o0, 0, 'lower-case head');
+assert.sameValue(0O0, 0, 'upper-case head');
+assert.sameValue(0o00, 0, 'lower-case head with leading zeros');
+assert.sameValue(0O00, 0, 'upper-case head with leading zeros');
+
+assert.sameValue(0o1, 1, 'lower-case head');
+assert.sameValue(0O1, 1, 'upper-case head');
+assert.sameValue(0o01, 1, 'lower-case head with leading zeros');
+assert.sameValue(0O01, 1, 'upper-case head with leading zeros');
+
+assert.sameValue(0o7, 7, 'lower-case head');
+assert.sameValue(0O7, 7, 'upper-case head');
+assert.sameValue(0o07, 7, 'lower-case head with leading zeros');
+assert.sameValue(0O07, 7, 'upper-case head with leading zeros');
+
+assert.sameValue(0o10, 8, 'lower-case head');
+assert.sameValue(0O10, 8, 'upper-case head');
+assert.sameValue(0o010, 8, 'lower-case head with leading zeros');
+assert.sameValue(0O010, 8, 'upper-case head with leading zeros');
+
+assert.sameValue(0o11, 9, 'lower-case head');
+assert.sameValue(0O11, 9, 'upper-case head');
+assert.sameValue(0o011, 9, 'lower-case head with leading zeros');
+assert.sameValue(0O011, 9, 'upper-case head with leading zeros');
+
+assert.sameValue(0o77, 63, 'lower-case head');
+assert.sameValue(0O77, 63, 'upper-case head');
+assert.sameValue(0o077, 63, 'lower-case head with leading zeros');
+assert.sameValue(0O077, 63, 'upper-case head with leading zeros');