diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 1204c6d188f..7c222db5c5c 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -39663,19 +39663,25 @@
    "webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-creation.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-creation.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html": [
@@ -41919,7 +41925,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/all/all_001_to_004.html": [
@@ -41943,7 +41951,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/atan/atan_001_to_008.html": [
@@ -42399,7 +42409,9 @@
    "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html": [
     [
      "/_mozilla/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html",
-     {}
+     {
+      "timeout": "long"
+     }
     ]
    ],
    "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html": [
@@ -71412,15 +71424,15 @@
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html": [
-   "6e329116409fae60838c3d4e63f84999b06cf1b5",
+   "1e2f82c2d11385b6549af174e4bcfe3399bdfbf4",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-creation.html": [
-   "2a6ebdcb04a602ae7b73a7a0385533f72c89c212",
+   "3443e38ef598fea1d78a5eb1c7ee63daf4de23e0",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html": [
-   "9eac94ca3bc359985efc1ac0e7e7c37ec2599278",
+   "c1300e9bcb26729faf65393d83541cb01fc08205",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/context/context-hidden-alpha.html": [
@@ -73112,7 +73124,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html": [
-   "85555ba68d88a743a41b691e864f5e2305c03bc3",
+   "2d9c0b4a7a750b9e12c0e17bf4492da1d5f0768f",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_float_frag_xvary.frag": [
@@ -73280,7 +73292,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html": [
-   "5ddd8eac037ae86a0f82aaebcd05f1702b4598ce",
+   "5ee97ea5fe44026d9ff65c37f3b56cb322fa2441",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_float_frag_xvary.frag": [
@@ -76444,7 +76456,7 @@
    "support"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html": [
-   "cadfc9c0ab49a1de7ee8ef91c49c20da40b405b4",
+   "2434d881b2ba6c153c45d5862da70e760dae4e44",
    "testharness"
   ],
   "webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_009_to_012.html": [
@@ -99164,7 +99176,7 @@
    "support"
   ],
   "webgl/tools/timeout.patch": [
-   "88da623430c6ab2c3738433604a5077a24a7a7a0",
+   "2690553f288896aaaf368475e307da2000fccfa4",
    "support"
   ],
   "webgl/tools/unit.patch": [
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
deleted file mode 100644
index fbdc89a8f0d..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation-and-destruction.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
deleted file mode 100644
index 393e42df192..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-creation.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[context-creation.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
deleted file mode 100644
index b2918fac56f..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[context-eviction-with-garbage-collection.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
deleted file mode 100644
index 86a561af11b..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[acos_001_to_006.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
deleted file mode 100644
index 2cd9fa6c511..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[asin_001_to_006.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
deleted file mode 100644
index 0bcf8268f38..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log/log_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log_001_to_008.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
deleted file mode 100644
index 579708b48b2..00000000000
--- a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[log2_001_to_008.html]
-  expected: TIMEOUT
-  [Overall test]
-    expected: NOTRUN
-
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
index 47099e57bd7..ac9f21ab3a0 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation-and-destruction.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that contexts are freed and garbage collected reasonably</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
index 703bcfa8dca..c7e4bcefb73 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-creation.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that you can create large numbers of WebGL contexts.</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
index b52e3a9e9f7..d7d04151b06 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/context/context-eviction-with-garbage-collection.html
@@ -29,7 +29,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>Test that context eviction and garbage collection do not interfere with each other</title>
 <link rel="stylesheet" href="../../resources/js-test-style.css"/>
 <script src=/resources/testharness.js></script>
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
index 71c89906388..2fd7d79b89d 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/acos/acos_001_to_006.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: acos_001_to_006.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
index 79afd9f4303..9a7bb04daf4 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/asin/asin_001_to_006.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: asin_001_to_006.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
index 539cb332140..3b1669c3370 100644
--- a/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
+++ b/tests/wpt/mozilla/tests/webgl/conformance-1.0.3/conformance/ogles/GL/log2/log2_001_to_008.html
@@ -28,7 +28,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<meta name="timeout" value="content">
+<meta name="timeout" content="long">
 <title>WebGL GLSL conformance test: log2_001_to_008.html</title>
 <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
 <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
diff --git a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
index da53aa632f7..5c594e70efe 100644
--- a/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
+++ b/tests/wpt/mozilla/tests/webgl/tools/timeout.patch
@@ -30,7 +30,7 @@ index a02dd2d14c..47099e57bd 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that contexts are freed and garbage collected reasonably</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -42,7 +42,7 @@ index 04b138daf4..703bcfa8dc 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that you can create large numbers of WebGL contexts.</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -54,7 +54,7 @@ index 3989c7679a..b52e3a9e9f 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>Test that context eviction and garbage collection do not interfere with each other</title>
  <link rel="stylesheet" href="../../resources/js-test-style.css"/>
  <script src=/resources/testharness.js></script>
@@ -66,7 +66,7 @@ index 99de4e0a79..71c8990638 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: acos_001_to_006.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
@@ -78,7 +78,7 @@ index 5af87433aa..79afd9f430 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: asin_001_to_006.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />
@@ -90,7 +90,7 @@ index 5552a4f82e..539cb33214 100644
  <html>
  <head>
  <meta charset="utf-8">
-+<meta name="timeout" value="content">
++<meta name="timeout" content="long">
  <title>WebGL GLSL conformance test: log2_001_to_008.html</title>
  <link rel="stylesheet" href="../../../../resources/js-test-style.css" />
  <link rel="stylesheet" href="../../../resources/ogles-tests.css" />