diff --git a/test/index.html b/test/index.html
index 8dcb56517..1b9647fd9 100644
--- a/test/index.html
+++ b/test/index.html
@@ -20,31 +20,21 @@
 		<div id="exports"></div>
 		<script>
 			var setProperty = (function() {
-				var defineProperty = (function() {
-					try {
-						var o = {},
-						    func = Object.defineProperty,
-						    result = func(o, o, o) && func;
-					} catch(e) { }
-					return result;
-				}());
-
-				if (!defineProperty) {
-					return function(object, key, value) {
-						object[key] = value;
-					};
-				}
+				var _defineProperty = Object.defineProperty;
 				return function(object, key, value) {
 					// avoid a bug where overwriting non-enumerable built-ins makes them enumerable
 					// https://code.google.com/p/v8/issues/detail?id=1623
-					defineProperty(object, key, {
-						'configurable': true,
-						'enumerable': false,
-						'writable': true,
-						'value': value
-					});
-
-				}
+					try {
+						_defineProperty(object, key, {
+							'configurable': true,
+							'enumerable': false,
+							'writable': true,
+							'value': value
+						});
+					} catch(e) {
+						object[key] = value;
+					}
+				};
 			}());
 
 			function addBizarroMethods() {
@@ -52,9 +42,6 @@
 				Function.prototype._method = function() {};
 
 				// allow bypassing native checks
-				var _fnToString = Function.prototype.toString;
-				setProperty(Function.prototype, '_toString', _fnToString);
-
 				setProperty(Function.prototype, 'toString', (function() {
 					function fnToString() {
 						setProperty(Function.prototype, 'toString', _fnToString);
@@ -62,6 +49,8 @@
 						setProperty(Function.prototype, 'toString', fnToString);
 						return result;
 					}
+					var _fnToString = Function.prototype.toString;
+					setProperty(Function.prototype, '_toString', _fnToString);
 					return fnToString;
 				}()));
 
diff --git a/test/test.js b/test/test.js
index 5d1387109..deaf1944f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -213,23 +213,20 @@
    * @param {string} key The name of the property to set.
    * @param {*} value The property value.
    */
-  var setProperty = (function() {
-    if (!defineProperty) {
-      return function(object, key, value) {
-        object[key] = value;
-      };
-    }
-    return function(object, key, value) {
-      // avoid a bug where overwriting non-enumerable built-ins makes them enumerable
-      // https://code.google.com/p/v8/issues/detail?id=1623
+  function setProperty(object, key, value) {
+    // avoid a bug where overwriting non-enumerable built-ins makes them enumerable
+    // https://code.google.com/p/v8/issues/detail?id=1623
+    try {
       defineProperty(object, key, {
         'configurable': true,
         'enumerable': false,
         'writable': true,
         'value': value
       });
-    };
-  }());
+    } catch(e) {
+      object[key] = value;
+    }
+  }
 
   /**
    * Skips a given number of tests with a passing result.
diff --git a/vendor/qunit-extras/qunit-extras.js b/vendor/qunit-extras/qunit-extras.js
index 45b158177..c341b19ef 100644
--- a/vendor/qunit-extras/qunit-extras.js
+++ b/vendor/qunit-extras/qunit-extras.js
@@ -331,13 +331,14 @@
               config = QUnit.config,
               index = -1,
               length = asserts.length,
+              logs = config.extrasData.logs,
               queue = config.queue;
 
           while (++index < length) {
             var assert = asserts[index];
             if (!assert.result && this.retries < config.asyncRetries) {
               this.retries++;
-              config.extrasData.logs.length -= asserts.length;
+              logs.length = Math.max(0, logs.length - asserts.length);
               asserts.length = 0;
 
               var oldLength = queue.length;