deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/GUM-optional-constraint.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[GUM-optional-constraint.https.html]
-  [Tests that setting an optional constraint in getUserMedia is handled as optional]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/GUM-trivial-constraint.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[GUM-trivial-constraint.https.html]
-  [Tests that setting a trivial mandatory constraint in getUserMedia works]
-    expected: FAIL
-

--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStream-MediaElement-preload-none.https.html.ini
@@ -1,29 +1,7 @@
 [MediaStream-MediaElement-preload-none.https.html]
-  expected:
-    if debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
   [Test that preload 'none' is ignored for MediaStream object URL used as src]
-    expected:
-      if debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      FAIL
+    expected: FAIL
 
   [Test that preload 'none' is ignored for MediaStream used as srcObject]
     expected: FAIL
 

--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStream-MediaElement-srcObject.https.html.ini
@@ -1,5 +1,4 @@
 [MediaStream-MediaElement-srcObject.https.html]
-  expected: TIMEOUT
   [Tests that a MediaStream can be assigned to a video element with srcObject]
-    expected: TIMEOUT
+    expected: FAIL
 

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-add-audio-track.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-add-audio-track.https.html]
-  expected: TIMEOUT
-  [Tests that adding a track to a MediaStream works as expected]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-audio-only.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-audio-only.https.html]
-  expected: TIMEOUT
-  [Tests that a MediaStream with exactly one audio track is returned]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-finished-add.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-finished-add.https.html]
-  expected: TIMEOUT
-  [Tests that adding a track to an inactive MediaStream is allowed]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-gettrackid.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[MediaStream-gettrackid.https.html]
-  [Tests that MediaStream.getTrackById works as expected]
-    expected: FAIL
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-idl.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-idl.https.html]
-  expected: TIMEOUT
-  [Tests that a MediaStream constructor follows the algorithm set in the spec]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-removetrack.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-removetrack.https.html]
-  expected: TIMEOUT
-  [Tests that a removal from a MediaStream works as expected]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStream-video-only.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStream-video-only.https.html]
-  expected: TIMEOUT
-  [Tests that a MediaStream with at least one video track is returned]
-    expected: TIMEOUT
-

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[MediaStreamTrack-MediaElement-disabled-audio-is-silence.https.html]
-  expected: TIMEOUT
-  [Tests that a disabled audio track in a MediaStream is rendered as silence]
-    expected: TIMEOUT
-

--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-MediaElement-disabled-video-is-black.https.html.ini
@@ -1,8 +1,7 @@
 [MediaStreamTrack-MediaElement-disabled-video-is-black.https.html]
-  expected: TIMEOUT
   [Tests that a disabled video track in a MediaStream is rendered as blackness]
-    expected: TIMEOUT
+    expected: FAIL
 
   [A disabled video track is rendered as blackness]
     expected: FAIL
 

--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-getSettings.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-getSettings.https.html.ini
@@ -1,7 +1,4 @@
 [MediaStreamTrack-getSettings.https.html]
-  [A device can be opened twice and have the same device ID]
-    expected: FAIL
-
   [A device can be opened twice with different resolutions]
     expected: FAIL
 

deleted file mode 100644
--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-id.https.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[MediaStreamTrack-id.https.html]
-  [Tests that distinct mediastream tracks have distinct ids ]
-    expected: FAIL
-

--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-idl.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-idl.https.html.ini
@@ -1,27 +1,19 @@
 [MediaStreamTrack-idl.https.html]
-  expected:
-    if debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-    if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-  [Test driver]
-    expected:
-      if not debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "mac") and (version == "OS X 10.10.5") and (processor == "x86_64") and (bits == 64): FAIL
-      if debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "10.0.15063") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and not e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if not debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86_64") and (bits == 64): TIMEOUT
-      if debug and e10s and (os == "win") and (version == "6.1.7601") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
-      if debug and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): TIMEOUT
+  [MediaStreamTrack interface: attribute onoverconstrained]
+    expected: FAIL
+
+  [MediaStreamTrack interface: operation getCapabilities()]
+    expected: FAIL
+
+  [MediaStreamTrack must be primary interface of track]
+    expected: FAIL
 
+  [Stringification of track]
+    expected: FAIL
+
+  [MediaStreamTrack interface: track must inherit property "onoverconstrained" with the proper type]
+    expected: FAIL
+
+  [MediaStreamTrack interface: track must inherit property "getCapabilities()" with the proper type]
+    expected: FAIL
+

--- a/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-init.https.html.ini
+++ b/testing/web-platform/meta/mediacapture-streams/MediaStreamTrack-init.https.html.ini
@@ -1,7 +1,4 @@
 [MediaStreamTrack-init.https.html]
   [Tests that the video MediaStreamTrack objects are properly initialized]
     expected: TIMEOUT
 
-  [getUserMedia({video:true}) creates a stream with a properly initialized video track]
-    expected: FAIL
-