diff --git a/src/computed-property-names/computed-property-name-from-yield-expression.case b/src/computed-property-names/computed-property-name-from-yield-expression.case
index af19153ff0..d6cde1031b 100644
--- a/src/computed-property-names/computed-property-name-from-yield-expression.case
+++ b/src/computed-property-names/computed-property-name-from-yield-expression.case
@@ -2,11 +2,16 @@
 // This code is governed by the BSD license found in the LICENSE file.
 
 /*---
-desc: Computed property name from condition expression
+desc: Computed property name from yield expression
 template: evaluation
 features: [computed-property-names]
 ---*/
+
+//- setup
+function * g() {
 //- ComputedPropertyName
-true ? 1 : 2
+yield 9
 //- value
-2
+9
+//- teardown
+}
diff --git a/src/computed-property-names/evaluation/yield-expression.template b/src/computed-property-names/evaluation/yield-expression.template
deleted file mode 100644
index 6aa249a634..0000000000
--- a/src/computed-property-names/evaluation/yield-expression.template
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (C) 2020 Rick Waldron. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/*---
-path: language/expressions/object/cpn-yield-expr-
-name: ComputedPropertyName in ObjectLiteral
-esid: prod-ComputedPropertyName
-info: |
-  ObjectLiteral:
-    { PropertyDefinitionList }
-
-  PropertyDefinitionList:
-    PropertyDefinition
-
-  PropertyDefinition:
-    PropertyName: AssignmentExpression
-
-  PropertyName:
-    ComputedPropertyName
-
-  ComputedPropertyName:
-    [ AssignmentExpression ]
----*/
-
-let o = {
-  [/*{ComputedPropertyName}*/]: /*{value}*/
-};
-
-assert.sameValue(
-  o[/*{ComputedPropertyName}*/],
-  /*{value}*/
-);
-assert.sameValue(
-  o[String(/*{ComputedPropertyName}*/)],
-  /*{value}*/
-);