diff --git a/test/index.html b/test/index.html
index d7904135f..c76be6215 100644
--- a/test/index.html
+++ b/test/index.html
@@ -144,10 +144,6 @@
 						return ArrayBuffer;
 					}(_ArrayBuffer));
 				}
-				setProperty(window, '_Float64Array', window.Float64Array);
-				if (!window._Float64Array) {
-					Float64Array = window.Uint8Array;
-				}
 				setProperty(window, 'WinRTError', Error);
 
 				setProperty(window, 'exports', window);
@@ -207,13 +203,6 @@
 				}
 				setProperty(window, '_ArrayBuffer', undefined);
 
-				if (window._Float64Array) {
-					Float64Array = _Float64Array;
-				} else {
-					setProperty(window, 'Float64Array', undefined);
-				}
-				setProperty(window, '_Float64Array', undefined);
-
 				setProperty(window, 'WinRTError', undefined);
 
 				setProperty(window, 'exports', undefined);
@@ -232,6 +221,9 @@
 				delete String.prototype._contains;
 			}
 
+			if (!window.Float64Array && window.Uint8Array) {
+				Float64Array = Uint8Array;
+			}
 			QUnit.config.hidepassed = true;
 
 			// load Lo-Dash and expose it to the bad extensions/shims
diff --git a/test/test.js b/test/test.js
index f99a620f9..df1bab383 100644
--- a/test/test.js
+++ b/test/test.js
@@ -409,8 +409,7 @@
       return ArrayBuffer;
     }()));
 
-    var _Float64Array = root.Float64Array;
-    if (!_Float64Array) {
+    if (!root.Float64Array) {
       setProperty(root, 'Float64Array', Uint8Array);
     }
     // fake `WinRTError`
@@ -437,8 +436,8 @@
     setProperty(Object, 'getPrototypeOf', _getPrototypeOf);
     setProperty(Object, 'keys', _keys);
 
-    setProperty(objectProto,   'hasOwnProperty', _hasOwnProperty);
-    setProperty(funcProto, 'toString', _fnToString);
+    setProperty(objectProto, 'hasOwnProperty', _hasOwnProperty);
+    setProperty(funcProto,   'toString', _fnToString);
 
     if (_isFinite) {
       setProperty(Number, 'isFinite', _isFinite);
@@ -455,13 +454,8 @@
     } else {
       delete root.ArrayBuffer;
     }
-    if (_Float64Array) {
-      setProperty(root, 'Float64Array', _Float64Array);
-    } else {
-      delete root.Float64Array;
-    }
-    delete root.window;
     delete root.WinRTError;
+    delete root.window;
     delete funcProto._method;
   }());