--- a/dom/media/test/eme.js
+++ b/dom/media/test/eme.js
@@ -154,29 +154,25 @@ function MaybeCrossOriginURI(test, uri)
 {
   if (test.crossOrigin) {
     return "http://test2.mochi.test:8888/tests/dom/media/test/allowed.sjs?" + uri;
   } else {
     return uri;
   }
 }
 
-function AppendTrack(test, ms, track, token, loadParams)
+function AppendTrack(test, ms, track, token)
 {
   return new Promise(function(resolve, reject) {
     var sb;
     var curFragment = 0;
     var resolved = false;
     var fragments = track.fragments;
     var fragmentFile;
 
-    if (loadParams && loadParams.onlyLoadFirstFragments) {
-      fragments = fragments.slice(0, loadParams.onlyLoadFirstFragments);
-    }
-
     function addNextFragment() {
       if (curFragment >= fragments.length) {
         Log(token, track.name + ": end of track");
         resolve();
         resolved = true;
         return;
       }
 
@@ -225,66 +221,49 @@ function AppendTrack(test, ms, track, to
     });
 
     addNextFragment();
   });
 }
 
 //Returns a promise that is resolved when the media element is ready to have
 //its play() function called; when it's loaded MSE fragments.
-function LoadTest(test, elem, token, loadParams)
+function LoadTest(test, elem, token)
 {
   if (!test.tracks) {
     ok(false, token + " test does not have a tracks list");
     return Promise.reject();
   }
 
   var ms = new MediaSource();
   elem.src = URL.createObjectURL(ms);
   elem.crossOrigin = test.crossOrigin || false;
 
   return new Promise(function (resolve, reject) {
     ms.addEventListener("sourceopen", function () {
       Log(token, "sourceopen");
       Promise.all(test.tracks.map(function(track) {
-        return AppendTrack(test, ms, track, token, loadParams);
+        return AppendTrack(test, ms, track, token);
       })).then(function() {
-        if (loadParams && loadParams.noEndOfStream) {
-          Log(token, "Tracks loaded");
-        } else {
-          Log(token, "Tracks loaded, calling MediaSource.endOfStream()");
-          ms.endOfStream();
-        }
+        Log(token, "Tracks loaded, calling MediaSource.endOfStream()");
+        ms.endOfStream();
         resolve();
       }).catch(reject);
     }, {once: true});
   });
 }
 
 function EMEPromise() {
   var self = this;
   self.promise = new Promise(function(resolve, reject) {
     self.resolve = resolve;
     self.reject = reject;
   });
 }
 
-// Finish |token| when all promises are resolved or any one promise is
-// rejected. It also clean up the media element to release resources.
-function EMEPromiseAll(v, token, promises) {
-  Promise.all(promises).then(values => {
-    removeNodeAndSource(v);
-    manager.finished(token);
-  }, reason => {
-    ok(false, TimeStamp(token) + " - Error during load: " + reason);
-    removeNodeAndSource(v);
-    manager.finished(token);
-  });
-}
-
 /*
  * Create a new MediaKeys object.
  * Return a promise which will be resolved with a new MediaKeys object,
  * or will be rejected with a string that describes the failure.
  */
 function CreateMediaKeys(v, test, token) {
   let p = new EMEPromise;
 
@@ -411,27 +390,27 @@ function CloseSessions(v, sessions) {
   .then(CleanUpMedia(v));
 }
 
 /*
  * Set up media keys and source buffers for the media element.
  * Return a promise resolved when all key sessions are updated or rejected
  * if any failure.
  */
-function SetupEME(v, test, token, loadParams) {
+function SetupEME(v, test, token) {
   let p = new EMEPromise;
 
   v.onerror = function() {
     p.reject(`${token} got an error event.`);
   }
 
   Promise.all([
     LoadInitData(v, test, token),
     CreateAndSetMediaKeys(v, test, token),
-    LoadTest(test, v, token, loadParams)])
+    LoadTest(test, v, token)])
   .then(values => {
     let initData = values[0];
     return ProcessInitData(v, test, token, initData);
   })
   .then(p.resolve, p.reject);
 
   return p.promise;
 }

--- a/dom/media/test/test_eme_canvas_blocked.html
+++ b/dom/media/test/test_eme_canvas_blocked.html
@@ -32,17 +32,17 @@ function startTest(test, token)
       ctx.drawImage(video, 0, 0);
     } catch (ex) {
       threwError = true;
     }
     ok(threwError, TimeStamp(token) + " - Should throw an error when trying to draw EME video to canvas.");
     p1.resolve();
   });
 
-  let p2 = SetupEME(v, test, token, { noEndOfStream:false });
+  let p2 = SetupEME(v, test, token);
 
   Promise.all([p1.promise, p2])
   .catch(reason => ok(false, reason))
   .then(() => {
     CleanUpMedia(v);
     manager.finished(token);
   });
 }

--- a/dom/media/test/test_eme_stream_capture_blocked_case1.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case1.html
@@ -43,17 +43,17 @@ function startTest(test, token)
   var node = context.createMediaElementSource(v1);
   v1.addEventListener("loadeddata", function(ev) {
     ok(false, TimeStamp(case1token) + " should never reach loadeddata, as setMediaKeys should fail");
   });
 
   manager.started(case1token);
 
   Promise.all([
-    LoadTest(test, v1, case1token, { noEndOfStream:false }),
+    LoadTest(test, v1, case1token),
     setMediaKeys()])
   .catch(reason => ok(false, reason))
   .then(() => {
     CleanUpMedia(v1);
     manager.finished(case1token);
   });
 }
 

--- a/dom/media/test/test_eme_stream_capture_blocked_case2.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case2.html
@@ -33,17 +33,17 @@ function startTest(test, token)
     } catch (e) {
       threw = true;
     }
     ok(threw, "Should throw an error creating a MediaElementSource on an EME video.");
     p1.resolve();
   });
 
   manager.started(case2token);
-  let p2 = SetupEME(v2, test, case2token, { noEndOfStream:false });
+  let p2 = SetupEME(v2, test, case2token);
 
   Promise.all([p1.promise, p2])
   .catch(reason => ok(false, reason))
   .then(() => {
     CleanUpMedia(v2);
     manager.finished(case2token);
   });
 }

--- a/dom/media/test/test_eme_stream_capture_blocked_case3.html
+++ b/dom/media/test/test_eme_stream_capture_blocked_case3.html
@@ -32,17 +32,17 @@ function startTest(test, token)
     } catch (e) {
       threw = true;
     }
     ok(threw, TimeStamp(case3token) + " Should throw an error calling mozCaptureStreamUntilEnded an EME video.");
     p1.resolve();
   });
 
   manager.started(case3token);
-  let p2 = SetupEME(v3, test, case3token, { noEndOfStream:false });
+  let p2 = SetupEME(v3, test, case3token);
 
   Promise.all([p1.promise, p2])
   .catch(reason => ok(false, reason))
   .then(() => {
     CleanUpMedia(v3);
     manager.finished(case3token);
   });
 }