diff --git a/test/built-ins/Number/15.7.3-1.js b/test/built-ins/Number/15.7.3-1.js
index a1c115b36a..9f302fe5d9 100644
--- a/test/built-ins/Number/15.7.3-1.js
+++ b/test/built-ins/Number/15.7.3-1.js
@@ -4,12 +4,6 @@
 /*---
 es5id: 15.7.3-1
 description: Number constructor - [[Prototype]] is the Function prototype object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if (Function.prototype.isPrototypeOf(Number) === true) {
-    return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Function.prototype.isPrototypeOf(Number), true, 'Function.prototype.isPrototypeOf(Number)');
diff --git a/test/built-ins/Number/15.7.3-2.js b/test/built-ins/Number/15.7.3-2.js
index 032263e8bf..e4bba35d8c 100644
--- a/test/built-ins/Number/15.7.3-2.js
+++ b/test/built-ins/Number/15.7.3-2.js
@@ -6,13 +6,8 @@ es5id: 15.7.3-2
 description: >
     Number constructor - [[Prototype]] is the Function prototype
     object (using getPrototypeOf)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var p = Object.getPrototypeOf(Number);
-  if (p === Function.prototype) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(p, Function.prototype, 'p');
diff --git a/test/built-ins/Number/15.7.4-1.js b/test/built-ins/Number/15.7.4-1.js
index b289681ce8..f9e919bad0 100644
--- a/test/built-ins/Number/15.7.4-1.js
+++ b/test/built-ins/Number/15.7.4-1.js
@@ -4,12 +4,9 @@
 /*---
 es5id: 15.7.4-1
 description: "Number prototype object: its [[Class]] must be 'Object'"
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var numProto = Object.getPrototypeOf(new Number(42));
   var s = Object.prototype.toString.call(numProto );
-  return (s === '[object Object]') ;
- }
-runTestCase(testcase);
+
+assert.sameValue(s, '[object Object]', 's');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Double.js b/test/built-ins/Number/isInteger/Number.isInteger_Double.js
index cf8d0d3c56..7cf69d73bf 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Double.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Double.js
@@ -5,12 +5,6 @@
 es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with a double.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger(6.75) === false) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger(6.75), false, 'Number.isInteger(6.75)');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js b/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
index 7a51ded2ff..4eb3282371 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Infinity.js
@@ -5,12 +5,6 @@
 es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with Infinity.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger(Infinity) === false) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger(Infinity), false, 'Number.isInteger(Infinity)');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_NaN.js b/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
index fbfa2bdb4c..e915ecfc85 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_NaN.js
@@ -5,12 +5,6 @@
 es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return false if called with NaN.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger(NaN) === false) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger(NaN), false, 'Number.isInteger(NaN)');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js b/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
index a40ed2561f..382c52a4a2 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_NonNumber.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Number.isInteger should return false if called with a string
     (non-Number)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger('2') === false) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger('2'), false, 'Number.isInteger("2")');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_String.js b/test/built-ins/Number/isInteger/Number.isInteger_String.js
index 7ac8ca8e45..71ddf854de 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_String.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_String.js
@@ -7,12 +7,6 @@ author: Ryan Lewis
 description: >
     Number.isInteger should return false if called with a string
     (non-Number)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger('word') === false) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger('word'), false, 'Number.isInteger("word")');
diff --git a/test/built-ins/Number/isInteger/Number.isInteger_Success.js b/test/built-ins/Number/isInteger/Number.isInteger_Success.js
index ea44f4cbca..d80454ef3d 100644
--- a/test/built-ins/Number/isInteger/Number.isInteger_Success.js
+++ b/test/built-ins/Number/isInteger/Number.isInteger_Success.js
@@ -5,12 +5,6 @@
 es6id: 20.1.2.3
 author: Ryan Lewis
 description: Number.isInteger should return true if called with an integer.
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
-  if(Number.isInteger(478) === true) {
-  	return true;
-  }
- }
-runTestCase(testcase);
+assert.sameValue(Number.isInteger(478), true, 'Number.isInteger(478)');
diff --git a/test/built-ins/Number/prototype/15.7.3.1-1.js b/test/built-ins/Number/prototype/15.7.3.1-1.js
index a4ae9bf7dc..cd834c8615 100644
--- a/test/built-ins/Number/prototype/15.7.3.1-1.js
+++ b/test/built-ins/Number/prototype/15.7.3.1-1.js
@@ -6,16 +6,11 @@ es5id: 15.7.3.1-1
 description: >
     Number.prototype is a data property with default attribute values
     (false)
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   var d = Object.getOwnPropertyDescriptor(Number, 'prototype');
   
-  if (d.writable === false &&
-      d.enumerable === false &&
-      d.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+
+assert.sameValue(d.writable, false, 'd.writable');
+assert.sameValue(d.enumerable, false, 'd.enumerable');
+assert.sameValue(d.configurable, false, 'd.configurable');
diff --git a/test/built-ins/Number/prototype/15.7.3.1-2.js b/test/built-ins/Number/prototype/15.7.3.1-2.js
index 836dcdf1d3..dbb49123f6 100644
--- a/test/built-ins/Number/prototype/15.7.3.1-2.js
+++ b/test/built-ins/Number/prototype/15.7.3.1-2.js
@@ -4,11 +4,8 @@
 /*---
 es5id: 15.7.3.1-2
 description: Number.prototype, initial value is the Number prototype object
-includes: [runTestCase.js]
 ---*/
 
-function testcase() {
   // assume that Number.prototype has not been modified.
-  return Object.getPrototypeOf(new Number(42))===Number.prototype;
- }
-runTestCase(testcase);
+
+assert.sameValue(Object.getPrototypeOf(new Number(42)), Number.prototype, 'Object.getPrototypeOf(new Number(42))');