diff --git a/src/test/content/test_element_classList.html b/src/test/content/test_element_classList.html
new file mode 100644
index 00000000000..ade4aa6a5a1
--- /dev/null
+++ b/src/test/content/test_element_classList.html
@@ -0,0 +1,21 @@
+<!-- Remove this and update WPT metadata once DOMTokenList.toggle (#3138) is implemented. -->
+<!DOCTYPE html>
+<html>
+    <head>
+        <script src="harness.js"></script>
+        <script>
+            let div = document.createElement("div");
+            div.className = "foo bar";
+
+            let classList = div.classList;
+            div.className = "";
+
+            is(classList.item(0), null, "classList.item(0) must return null when all classes have been removed");
+            is(classList[0], undefined, "classList[0] must be undefined when all classes have been removed");
+
+            finish();
+        </script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/src/test/wpt/metadata/dom/nodes/Element-classlist.html.ini b/src/test/wpt/metadata/dom/nodes/Element-classlist.html.ini
index b1c1947cac2..c072735d502 100644
--- a/src/test/wpt/metadata/dom/nodes/Element-classlist.html.ini
+++ b/src/test/wpt/metadata/dom/nodes/Element-classlist.html.ini
@@ -102,6 +102,12 @@
   [classList must stringify to an empty string when all classes have been removed]
     expected: FAIL
 
+  [classList.item(0) must return null when all classes have been removed]
+    expected: FAIL
+
+  [classList[0\] must be undefined when all classes have been removed]
+    expected: FAIL
+
   [classList.add should treat " " as a space]
     expected: FAIL
 
