diff --git a/test/built-ins/Promise/prototype/catch/this-value-non-object.js b/test/built-ins/Promise/prototype/catch/this-value-non-object.js
new file mode 100644
index 0000000000..1849e9d716
--- /dev/null
+++ b/test/built-ins/Promise/prototype/catch/this-value-non-object.js
@@ -0,0 +1,31 @@
+// 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-promise.prototype.catch
+es6id: 25.4.5.1
+description: >
+  Promise.prototype.catch called with a non-object-coercible `this` value
+info: |
+  1. Let promise be the this value.
+  2. Return ? Invoke(promise, "then", «undefined, onRejected»).
+
+  7.3.18 Invoke
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. If argumentsList was not passed, let argumentsList be a new empty List.
+  3. Let func be ? GetV(V, P).
+  4. Return ? Call(func, V, argumentsList).
+
+  7.3.2 GetV
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. Let O be ? ToObject(V).
+---*/
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call(undefined);
+}, 'undefined');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call(null);
+}, 'null');
diff --git a/test/built-ins/Promise/prototype/catch/this-value-obj-coercible.js b/test/built-ins/Promise/prototype/catch/this-value-obj-coercible.js
new file mode 100644
index 0000000000..905dd966a0
--- /dev/null
+++ b/test/built-ins/Promise/prototype/catch/this-value-obj-coercible.js
@@ -0,0 +1,44 @@
+// 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-promise.prototype.catch
+es6id: 25.4.5.1
+description: >
+  Promise.prototype.catch called with an object-coercible `this` value
+info: |
+  1. Let promise be the this value.
+  2. Return ? Invoke(promise, "then", «undefined, onRejected»).
+
+  7.3.18 Invoke
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. If argumentsList was not passed, let argumentsList be a new empty List.
+  3. Let func be ? GetV(V, P).
+  4. Return ? Call(func, V, argumentsList).
+
+  7.3.2 GetV
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. Let O be ? ToObject(V).
+features: [Symbol]
+---*/
+
+var booleanCount = 0;
+Boolean.prototype.then = function() { booleanCount += 1; };
+Promise.prototype.catch.call(true);
+assert.sameValue(booleanCount, 1, 'boolean');
+
+var numberCount = 0;
+Number.prototype.then = function() { numberCount += 1; };
+Promise.prototype.catch.call(34);
+assert.sameValue(numberCount, 1, 'number');
+
+var stringCount = 0;
+String.prototype.then = function() { stringCount += 1; };
+Promise.prototype.catch.call('');
+assert.sameValue(stringCount, 1, 'string');
+
+var symbolCount = 0;
+Symbol.prototype.then = function() { symbolCount += 1; };
+Promise.prototype.catch.call(Symbol());
+assert.sameValue(symbolCount, 1, 'symbol');
diff --git a/test/built-ins/Promise/prototype/catch/this-value-then-not-callable.js b/test/built-ins/Promise/prototype/catch/this-value-then-not-callable.js
new file mode 100644
index 0000000000..1feffa35bb
--- /dev/null
+++ b/test/built-ins/Promise/prototype/catch/this-value-then-not-callable.js
@@ -0,0 +1,62 @@
+// 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-promise.prototype.catch
+es6id: 25.4.5.1
+description: >
+  Promise.prototype.catch called with a `this` value that does not define a
+  callable `this` property
+info: |
+  1. Let promise be the this value.
+  2. Return ? Invoke(promise, "then", «undefined, onRejected»).
+
+  7.3.18 Invoke
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. If argumentsList was not passed, let argumentsList be a new empty List.
+  3. Let func be ? GetV(V, P).
+  4. Return ? Call(func, V, argumentsList).
+
+  7.3.2 GetV
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. Let O be ? ToObject(V).
+  3. Return ? O.[[Get]](P, V).
+
+  7.3.12 Call (F, V [ , argumentsList ])
+
+  1. If argumentsList was not passed, let argumentsList be a new empty List.
+  2. If IsCallable(F) is false, throw a TypeError exception.
+  3. Return ? F.[[Call]](V, argumentsList).
+features: [Symbol]
+---*/
+
+var symbol = Symbol();
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({});
+}, 'undefined');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: null });
+}, 'null');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: 1 });
+}, 'number');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: '' });
+}, 'string');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: true });
+}, 'boolean');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: symbol });
+}, 'symbol');
+
+assert.throws(TypeError, function() {
+  Promise.prototype.catch.call({ then: {} });
+}, 'ordinary object');
diff --git a/test/built-ins/Promise/prototype/catch/this-value-then-poisoned.js b/test/built-ins/Promise/prototype/catch/this-value-then-poisoned.js
new file mode 100644
index 0000000000..4b53ca82e8
--- /dev/null
+++ b/test/built-ins/Promise/prototype/catch/this-value-then-poisoned.js
@@ -0,0 +1,34 @@
+// 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-promise.prototype.catch
+es6id: 25.4.5.1
+description: >
+  Promise.prototype.catch called with a `this` value whose `then` property is
+  an accessor property that returns an abrupt completion
+info: |
+  1. Let promise be the this value.
+  2. Return ? Invoke(promise, "then", «undefined, onRejected»).
+
+  7.3.18 Invoke
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. If argumentsList was not passed, let argumentsList be a new empty List.
+  3. Let func be ? GetV(V, P).
+
+  7.3.2 GetV
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. Let O be ? ToObject(V).
+  3. Return ? O.[[Get]](P, V).
+---*/
+
+var poisonedThen = Object.defineProperty({}, 'then', {
+  get: function() {
+    throw new Test262Error();
+  }
+});
+
+assert.throws(Test262Error, function() {
+  Promise.prototype.catch.call(poisonedThen);
+});
diff --git a/test/built-ins/Promise/prototype/catch/this-value-then-throws.js b/test/built-ins/Promise/prototype/catch/this-value-then-throws.js
new file mode 100644
index 0000000000..e5c5cf9361
--- /dev/null
+++ b/test/built-ins/Promise/prototype/catch/this-value-then-throws.js
@@ -0,0 +1,41 @@
+// 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-promise.prototype.catch
+es6id: 25.4.5.1
+description: >
+  Promise.prototype.catch called with a `this` value that defines a `then`
+  method which returns an abrupt completion.
+info: |
+  1. Let promise be the this value.
+  2. Return ? Invoke(promise, "then", «undefined, onRejected»).
+
+  7.3.18 Invoke
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. If argumentsList was not passed, let argumentsList be a new empty List.
+  3. Let func be ? GetV(V, P).
+  4. Return ? Call(func, V, argumentsList).
+
+  7.3.2 GetV
+
+  1. Assert: IsPropertyKey(P) is true.
+  2. Let O be ? ToObject(V).
+  3. Return ? O.[[Get]](P, V).
+
+  7.3.12 Call (F, V [ , argumentsList ])
+
+  1. If argumentsList was not passed, let argumentsList be a new empty List.
+  2. If IsCallable(F) is false, throw a TypeError exception.
+  3. Return ? F.[[Call]](V, argumentsList).
+---*/
+
+var thrower = {
+  then: function() {
+    throw new Test262Error();
+  }
+};
+
+assert.throws(Test262Error, function() {
+  Promise.prototype.catch.call(thrower);
+});