--- a/dom/canvas/test/test_capture.html
+++ b/dom/canvas/test/test_capture.html
@@ -93,16 +93,29 @@ function checkDrawImageNotCleanRed() {
     .then(() => h.waitForPixelColor(vmanual, h.green, 0, "should still be green"))
     .then(() => h.requestFrame(vmanual))
     .then(() => h.waitForPixelColorTimeout(vmanual, h.red, 0, 1000,
                                            "should not become red"))
     .catch(err => ok(false, "checkDrawImageNotCleanRed failed: ", err))
     .then(() => drawing.stop());
 }
 
+function checkEndedOnStop() {
+  let promises = [vauto, vmanual, vrate].map(elem => {
+    elem.srcObject.getTracks()[0].stop();
+    return new Promise(resolve =>
+      elem.addEventListener("ended", function endedListener(event) {
+        ok(true, "Element " + elem.id + " ended.");
+        resolve();
+        elem.removeEventListener("ended", endedListener);
+      }));
+  });
+  return Promise.all(promises);
+}
+
 function finish() {
   ok(true, 'Test complete.');
   SimpleTest.finish();
 }
 
 function beginTest() {
   h = new CaptureStreamTestHelper2D();
 
@@ -112,16 +125,17 @@ function beginTest() {
   vrate = h.createAndAppendElement('video', 'vrate');
 
   Promise.resolve()
     .then(checkDrawColorInitialRed)
     .then(checkDrawColorGreen)
     .then(checkRequestFrameOrderGuarantee)
     .then(checkDrawColorGreen) // Restore video elements to green.
     .then(checkDrawImageNotCleanRed)
+    .then(checkEndedOnStop)
     .then(finish);
 }
 
 SimpleTest.waitForExplicitFinish();
 
 beginTest();
 </script>