8 files changed, 38 insertions, 34 deletions
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/length.js b/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/length.js
index b2cf331005..55b25f33c4 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/length.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/length.js
@@ -20,10 +20,11 @@ features: [Symbol.toPrimitive]
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(Symbol.prototype[Symbol.toPrimitive].length, 1);
-
-verifyNotEnumerable(Symbol.prototype[Symbol.toPrimitive], 'length');
-verifyNotWritable(Symbol.prototype[Symbol.toPrimitive], 'length');
-verifyConfigurable(Symbol.prototype[Symbol.toPrimitive], 'length');
+verifyProperty(Symbol.prototype[Symbol.toPrimitive], "length", {
+  value: 1,
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/name.js b/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/name.js
index 58579822e7..c31147ac68 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/name.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/Symbol.toPrimitive/name.js
@@ -17,12 +17,11 @@ features: [Symbol.toPrimitive]
 includes: [propertyHelper.js]
 ---*/
 
-assert.sameValue(
-  Symbol.prototype[Symbol.toPrimitive].name, '[Symbol.toPrimitive]'
-);
-
-verifyNotEnumerable(Symbol.prototype[Symbol.toPrimitive], 'name');
-verifyNotWritable(Symbol.prototype[Symbol.toPrimitive], 'name');
-verifyConfigurable(Symbol.prototype[Symbol.toPrimitive], 'name');
+verifyProperty(Symbol.prototype[Symbol.toPrimitive], "name", {
+  value: "[Symbol.toPrimitive]",
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/toString/length.js b/js/src/tests/test262/built-ins/Symbol/prototype/toString/length.js
index 84e95cf747..22cc78485f 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/toString/length.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/toString/length.js
@@ -23,10 +23,11 @@ includes: [propertyHelper.js]
 features: [Symbol]
 ---*/
 
-assert.sameValue(Symbol.prototype.toString.length, 0);
-
-verifyNotEnumerable(Symbol.prototype.toString, "length");
-verifyNotWritable(Symbol.prototype.toString, "length");
-verifyConfigurable(Symbol.prototype.toString, "length");
+verifyProperty(Symbol.prototype.toString, "length", {
+  value: 0,
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/toString/name.js b/js/src/tests/test262/built-ins/Symbol/prototype/toString/name.js
index 705eb779f6..d6aa21719e 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/toString/name.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/toString/name.js
@@ -20,10 +20,11 @@ includes: [propertyHelper.js]
 features: [Symbol]
 ---*/
 
-assert.sameValue(Symbol.prototype.toString.name, "toString");
-
-verifyNotEnumerable(Symbol.prototype.toString, "name");
-verifyNotWritable(Symbol.prototype.toString, "name");
-verifyConfigurable(Symbol.prototype.toString, "name");
+verifyProperty(Symbol.prototype.toString, "name", {
+  value: "toString",
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/toString/not-a-constructor.js b/js/src/tests/test262/built-ins/Symbol/prototype/toString/not-a-constructor.js
index 58914a60d2..c590ca39e0 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/toString/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/toString/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   let symbol = Symbol(); new symbol.toString();
-}, '`let symbol = Symbol(); new symbol.toString()` throws TypeError');
+});
 
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/length.js b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/length.js
index 0134f86d03..3fe32533ba 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/length.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/length.js
@@ -23,10 +23,11 @@ includes: [propertyHelper.js]
 features: [Symbol]
 ---*/
 
-assert.sameValue(Symbol.prototype.valueOf.length, 0);
-
-verifyNotEnumerable(Symbol.prototype.valueOf, "length");
-verifyNotWritable(Symbol.prototype.valueOf, "length");
-verifyConfigurable(Symbol.prototype.valueOf, "length");
+verifyProperty(Symbol.prototype.valueOf, "length", {
+  value: 0,
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/name.js b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/name.js
index a9104cd8a8..4ff3ef9dfa 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/name.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/name.js
@@ -20,10 +20,11 @@ includes: [propertyHelper.js]
 features: [Symbol]
 ---*/
 
-assert.sameValue(Symbol.prototype.valueOf.name, "valueOf");
-
-verifyNotEnumerable(Symbol.prototype.valueOf, "name");
-verifyNotWritable(Symbol.prototype.valueOf, "name");
-verifyConfigurable(Symbol.prototype.valueOf, "name");
+verifyProperty(Symbol.prototype.valueOf, "name", {
+  value: "valueOf",
+  writable: false,
+  enumerable: false,
+  configurable: true
+});
 
 reportCompare(0, 0);
diff --git a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/not-a-constructor.js b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/not-a-constructor.js
index e9edf778b8..7d0dbb5390 100644
--- a/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/not-a-constructor.js
+++ b/js/src/tests/test262/built-ins/Symbol/prototype/valueOf/not-a-constructor.js
@@ -29,7 +29,7 @@ assert.sameValue(
 
 assert.throws(TypeError, () => {
   let symbol = Symbol(); new symbol.valueOf();
-}, '`let symbol = Symbol(); new symbol.valueOf()` throws TypeError');
+});
 
 
 reportCompare(0, 0);