diff --git a/test/language/statements/class/subclass/class-definition-superclass-generator.js b/test/language/statements/class/subclass/class-definition-superclass-generator.js
deleted file mode 100644
index e9f9271878..0000000000
--- a/test/language/statements/class/subclass/class-definition-superclass-generator.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright (C) 2014 the V8 project authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-/*---
-es6id: 14.5.14_S6.g.i
-description: >
-    Runtime Semantics: ClassDefinitionEvaluation
-
-    If superclass has a [[FunctionKind]] internal slot whose value is "generator", throw a TypeError exception.
-features: [generators]
----*/
-function * G() {}
-
-assert.throws(TypeError, function() {
-  class A extends G {
-   constructor() {
-      super();
-    }
-  }
-});
-
diff --git a/test/language/statements/class/subclass/superclass-generator-function.js b/test/language/statements/class/subclass/superclass-generator-function.js
new file mode 100644
index 0000000000..e814943b1f
--- /dev/null
+++ b/test/language/statements/class/subclass/superclass-generator-function.js
@@ -0,0 +1,42 @@
+// Copyright (C) 2014 the V8 project authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+/*---
+esid: sec-runtime-semantics-classdefinitionevaluation
+description: >
+  IsConstructor check is performed before "prototype" lookup.
+  Generator functions are not constructors (MakeConstructor is not called on them).
+info: |
+  ClassDefinitionEvaluation
+
+  [...]
+  5. Else,
+    [...]
+    d. Let superclass be ? GetValue(superclassRef).
+    e. If superclass is null, then
+      [...]
+    f. Else if IsConstructor(superclass) is false, throw a TypeError exception.
+features: [generators, class, Proxy]
+---*/
+
+function* fn() {}
+
+assert.throws(TypeError, function() {
+  class A extends fn {}
+});
+
+var bound = (function* () {}).bind();
+Object.defineProperty(bound, "prototype", {
+  get: function() {
+    throw new Test262Error("`superclass.prototype` is unreachable");
+  },
+});
+
+assert.throws(TypeError, function() {
+  class C extends bound {}
+});
+
+var proxy = new Proxy(function* () {}, {});
+
+assert.throws(TypeError, function() {
+  class C extends proxy {}
+});