diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 5409dba1486..d9c05ce7ba0 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -9,32 +9,6 @@
 # Should be == with expected failure:
 fragment=top != ../html/acid2.html acid2_ref.html
 
-== 2dcontext/drawimage_canvas_1.html 2dcontext/drawimage_canvas_1_ref.html
-== 2dcontext/drawimage_canvas_10.html 2dcontext/drawimage_canvas_10_ref.html
-== 2dcontext/drawimage_canvas_11.html 2dcontext/drawimage_canvas_11_ref.html
-== 2dcontext/drawimage_canvas_12.html 2dcontext/drawimage_canvas_12_ref.html
-== 2dcontext/drawimage_canvas_2.html 2dcontext/drawimage_canvas_2_ref.html
-== 2dcontext/drawimage_canvas_3.html 2dcontext/drawimage_canvas_3_ref.html
-== 2dcontext/drawimage_canvas_4.html 2dcontext/drawimage_canvas_4_ref.html
-== 2dcontext/drawimage_canvas_5.html 2dcontext/drawimage_canvas_5_ref.html
-== 2dcontext/drawimage_canvas_6.html 2dcontext/drawimage_canvas_6_ref.html
-== 2dcontext/drawimage_canvas_7.html 2dcontext/drawimage_canvas_7_ref.html
-== 2dcontext/drawimage_canvas_8.html 2dcontext/drawimage_canvas_8_ref.html
-== 2dcontext/drawimage_canvas_9.html 2dcontext/drawimage_canvas_9_ref.html
-== 2dcontext/drawimage_html_image_1.html 2dcontext/drawimage_html_image_1_ref.html
-== 2dcontext/drawimage_html_image_10.html 2dcontext/drawimage_html_image_10_ref.html
-== 2dcontext/drawimage_html_image_11.html 2dcontext/drawimage_html_image_11_ref.html
-== 2dcontext/drawimage_html_image_12.html 2dcontext/drawimage_html_image_12_ref.html
-== 2dcontext/drawimage_html_image_2.html 2dcontext/drawimage_html_image_2_ref.html
-== 2dcontext/drawimage_html_image_3.html 2dcontext/drawimage_html_image_3_ref.html
-== 2dcontext/drawimage_html_image_4.html 2dcontext/drawimage_html_image_4_ref.html
-== 2dcontext/drawimage_html_image_5.html 2dcontext/drawimage_html_image_5_ref.html
-== 2dcontext/drawimage_html_image_6.html 2dcontext/drawimage_html_image_6_ref.html
-== 2dcontext/drawimage_html_image_7.html 2dcontext/drawimage_html_image_7_ref.html
-== 2dcontext/drawimage_html_image_8.html 2dcontext/drawimage_html_image_8_ref.html
-== 2dcontext/drawimage_html_image_9.html 2dcontext/drawimage_html_image_9_ref.html
-
-
 == 2dcontext/lineto_a.html 2dcontext/lineto_ref.html
 == 2dcontext/transform_a.html 2dcontext/transform_ref.html
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 90d23f18817..e2e802f4ae1 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -20178,8 +20178,612 @@
   },
   "local_changes": {
     "deleted": [],
-    "items": {},
-    "reftest_nodes": {}
+    "items": {
+      "reftest": {
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html"
+          }
+        ],
+        "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html": [
+          {
+            "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html",
+            "references": [
+              [
+                "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html"
+          }
+        ]
+      }
+    },
+    "reftest_nodes": {
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html"
+        }
+      ],
+      "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html": [
+        {
+          "path": "2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html",
+          "references": [
+            [
+              "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html"
+        }
+      ]
+    }
   },
   "reftest_nodes": {
     "2dcontext/building-paths/canvas_complexshapes_arcto_001.htm": [
diff --git a/tests/ref/2x2.png b/tests/wpt/web-platform-tests/2dcontext/2x2.png
similarity index 100%
rename from tests/ref/2x2.png
rename to tests/wpt/web-platform-tests/2dcontext/2x2.png
diff --git a/tests/ref/2dcontext/drawimage_canvas_1.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html
similarity index 92%
rename from tests/ref/2dcontext/drawimage_canvas_1.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html
index 4c3ab02b123..871e279ac55 100644
--- a/tests/ref/2dcontext/drawimage_canvas_1.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_1_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -35,5 +32,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 0, 0);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_10.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html
similarity index 94%
rename from tests/ref/2dcontext/drawimage_canvas_10.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html
index 35f7245c563..14e15ffc3f8 100644
--- a/tests/ref/2dcontext/drawimage_canvas_10.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_10_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -39,5 +36,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 0, 0, 50, 50, 0, 0, 200, 200);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_canvas_10_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_10_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_10_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_11.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_canvas_11.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html
index b0f148527be..e06dfc0df7e 100644
--- a/tests/ref/2dcontext/drawimage_canvas_11.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11.html
@@ -1,14 +1,11 @@
-  <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_11_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 0, 0, 100, 100, 0, 0, 50, 50);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_canvas_11_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_11_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_11_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_12.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_canvas_12.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html
index 36a31cbaf2c..47debc796ec 100644
--- a/tests/ref/2dcontext/drawimage_canvas_12.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12.html
@@ -1,14 +1,11 @@
-  <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_12_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, -25, -25, 50, 50, 0, 0, 50, 50);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_canvas_12_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_12_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_12_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_1_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_1_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_1_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_2.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html
similarity index 92%
rename from tests/ref/2dcontext/drawimage_canvas_2.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html
index 3cca00648c8..b169d3743c4 100644
--- a/tests/ref/2dcontext/drawimage_canvas_2.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_2_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -36,5 +33,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 25, 25);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_2_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_2_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_2_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_3.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_3.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html
index 392723bd9f7..e59e5d352de 100644
--- a/tests/ref/2dcontext/drawimage_canvas_3.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_3_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 50, 50, 50, 50);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_3_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_3_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_3_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_4.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_4.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html
index a46986a68f0..f3dd84e2a35 100644
--- a/tests/ref/2dcontext/drawimage_canvas_4.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_4_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -38,5 +35,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 50, 50, 20, 20);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_4_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_4_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_4_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_5.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_5.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html
index 0ddff823a35..2190847f8be 100644
--- a/tests/ref/2dcontext/drawimage_canvas_5.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_5_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 50, 50, 50, 20);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_canvas_5_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_5_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_5_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_6.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_6.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html
index e94efaadfa1..2ce48d8fafd 100644
--- a/tests/ref/2dcontext/drawimage_canvas_6.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_6_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 0, 0, 25, 25, 0, 0, 25, 25);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_6_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_6_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_6_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_7.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_7.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html
index 9ace085d979..1952909211d 100644
--- a/tests/ref/2dcontext/drawimage_canvas_7.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_7_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 0, 0, 25, 25, 25, 25, 25, 25);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_7_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_7_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_7_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_8.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_canvas_8.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html
index d1c1f5bced6..c47a5b55ce9 100644
--- a/tests/ref/2dcontext/drawimage_canvas_8.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_8_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -37,5 +34,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceCanvas, 25, 25, 50, 50, 0, 0, 50, 50);
 
 </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/ref/2dcontext/drawimage_canvas_8_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_8_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_8_ref.html
diff --git a/tests/ref/2dcontext/drawimage_canvas_9.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html
similarity index 94%
rename from tests/ref/2dcontext/drawimage_canvas_9.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html
index 510f9c923c2..7cb61b67aee 100644
--- a/tests/ref/2dcontext/drawimage_canvas_9.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9.html
@@ -1,8 +1,6 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_canvas_9_ref.html>
 <style>
   html, body {
     margin: 0;
@@ -44,5 +42,3 @@ catch(err) {
 }
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_canvas_9_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_canvas_9_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_canvas_9_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_1.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
similarity index 87%
rename from tests/ref/2dcontext/drawimage_html_image_1.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
index 9619103b0fe..ea5be1227cf 100644
--- a/tests/ref/2dcontext/drawimage_html_image_1.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_1_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -17,7 +14,7 @@ var sourceHeight = 100;
 var smoothingEnabled = false;
 var destCanvas = document.getElementById('dest');
 var sourceImg = document.createElement('img');
-sourceImg.src = '../rust-0.png'
+sourceImg.src = '../2x2.png'
 sourceImg.width = sourceWidth;
 sourceImg.height = sourceHeight;
 
@@ -30,5 +27,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 0, 0);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_10.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
similarity index 92%
rename from tests/ref/2dcontext/drawimage_html_image_10.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
index 704e51109b6..68363633382 100644
--- a/tests/ref/2dcontext/drawimage_html_image_10.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_10_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -34,5 +31,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 0, 0, 512, 512, 0, 0, 256, 256);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_10_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_10_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_10_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_11.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_11.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
index fa3ad4125f8..d21d3d925b1 100644
--- a/tests/ref/2dcontext/drawimage_html_image_11.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_11_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 0, 0, 2048, 2048, 0, 0, 800, 800);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_11_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_11_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_11_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_12.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_12.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
index a9a7560b94b..dc9c8d6bb7d 100644
--- a/tests/ref/2dcontext/drawimage_html_image_12.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_12_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, -25, -25, 50, 50, 0, 0, 50, 50);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_12_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_12_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_12_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_13.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html
similarity index 93%
rename from tests/ref/2dcontext/drawimage_html_image_13.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html
index 4d81d63b8b1..43f9512dbcf 100644
--- a/tests/ref/2dcontext/drawimage_html_image_13.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_13_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -40,5 +37,3 @@ catch(err) {
 }
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_13_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_13_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_13_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_1_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html
similarity index 83%
rename from tests/ref/2dcontext/drawimage_html_image_1_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html
index 78c31206c50..60545df17ff 100644
--- a/tests/ref/2dcontext/drawimage_html_image_1_ref.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_1_ref.html
@@ -10,7 +10,7 @@
   #destination {
     width: 100px;
     height: 100px;
-    background-image: url("../rust-0.png");
+    background-image: url("../2x2.png");
   }
 </style>
 <body>
diff --git a/tests/ref/2dcontext/drawimage_html_image_2.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
similarity index 87%
rename from tests/ref/2dcontext/drawimage_html_image_2.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
index e38c85fc27e..9eeaae95ebb 100644
--- a/tests/ref/2dcontext/drawimage_html_image_2.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_2_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -17,7 +14,7 @@ var sourceHeight = 100;
 var smoothingEnabled = false;
 var destCanvas = document.getElementById('dest');
 var sourceImg = document.createElement('img');
-sourceImg.src = '../rust-0.png'
+sourceImg.src = '../2x2.png'
 sourceImg.width = sourceWidth;
 sourceImg.height = sourceHeight;
 
@@ -31,5 +28,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 25, 25);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_2_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html
similarity index 87%
rename from tests/ref/2dcontext/drawimage_html_image_2_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html
index c8f719b2b14..c4535283500 100644
--- a/tests/ref/2dcontext/drawimage_html_image_2_ref.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_2_ref.html
@@ -12,7 +12,7 @@
     width: 100px;
     height: 100px;
     background-color: red;
-    background-image: url("../rust-0.png");
+    background-image: url("../2x2.png");
     background-position: 25px 25px;
     background-repeat: no-repeat;
   }
diff --git a/tests/ref/2dcontext/drawimage_html_image_3.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_3.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
index 8a85fc2fef9..63b303944ba 100644
--- a/tests/ref/2dcontext/drawimage_html_image_3.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_3_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -31,5 +28,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 50, 50, 50, 50);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_3_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_3_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_3_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_4.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
similarity index 92%
rename from tests/ref/2dcontext/drawimage_html_image_4.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
index 8158fe2b4db..dfaf4018d69 100644
--- a/tests/ref/2dcontext/drawimage_html_image_4.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_4_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 50, 50, 16, 16);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_4_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_4_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_4_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_5.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_5.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
index 871379e500a..a359fdf35b5 100644
--- a/tests/ref/2dcontext/drawimage_html_image_5.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_5_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -31,5 +28,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 50, 50, 64, 32);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_5_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_5_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_5_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_6.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_6.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
index 793a1757547..4482ca3c319 100644
--- a/tests/ref/2dcontext/drawimage_html_image_6.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_6_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 0, 0, 32, 32, 0, 0, 32, 32);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_6_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_6_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_6_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_7.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_7.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
index 1b0de346bc1..cf6daa0d4c3 100644
--- a/tests/ref/2dcontext/drawimage_html_image_7.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_7_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 0, 0, 32, 32, 32, 32, 32, 32);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_7_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_7_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_7_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_8.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
similarity index 91%
rename from tests/ref/2dcontext/drawimage_html_image_8.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
index 0197f28c494..c1ebfa81648 100644
--- a/tests/ref/2dcontext/drawimage_html_image_8.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_8_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -32,5 +29,3 @@ destCtx.imageSmoothingEnabled = smoothingEnabled;
 destCtx.drawImage(sourceImg, 32, 32, 32, 32, 0, 0, 32, 32);
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_8_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_8_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_8_ref.html
diff --git a/tests/ref/2dcontext/drawimage_html_image_9.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html
similarity index 92%
rename from tests/ref/2dcontext/drawimage_html_image_9.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html
index 7caf475065c..f0fc85d384a 100644
--- a/tests/ref/2dcontext/drawimage_html_image_9.html
+++ b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9.html
@@ -1,14 +1,11 @@
 <!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-</head>
+<meta charset="utf-8">
+<link rel=match href=drawimage_html_image_9_ref.html>
 <style>
   html, body {
     margin: 0;
   }
 </style>
-<body>
 <canvas id="dest" height="100" width="100"></canvas>
 <script>
 
@@ -39,5 +36,3 @@ catch(err) {
 }
 
 </script>
-</body>
-</html>
diff --git a/tests/ref/2dcontext/drawimage_html_image_9_ref.html b/tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9_ref.html
similarity index 100%
rename from tests/ref/2dcontext/drawimage_html_image_9_ref.html
rename to tests/wpt/web-platform-tests/2dcontext/drawing-images-to-the-canvas/drawimage_html_image_9_ref.html