diff --git a/tests/content/test_document_characterSet_long.html.disabled b/tests/content/test_document_characterSet_long.html.disabled
deleted file mode 100644
index abf547127a8..00000000000
--- a/tests/content/test_document_characterSet_long.html.disabled
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: long charset
-            {
-                is(document.characterSet, "windows-1252", "test1-0, long charset");
-            }
-
-            finish();
-        </script>
-    </head>
-</html>
diff --git a/tests/content/test_document_characterSet_short.html.disabled b/tests/content/test_document_characterSet_short.html.disabled
deleted file mode 100644
index 358d4f8ba74..00000000000
--- a/tests/content/test_document_characterSet_short.html.disabled
+++ /dev/null
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<meta charset="iso-8859-1">
-<html>
-    <head>
-        <script src="harness.js"></script>
-        <script>
-            // test1: short charset
-            {
-                is(document.characterSet, "windows-1252", "test1-0, short charset");
-            }
-
-            finish();
-        </script>
-    </head>
-</html>
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 49e66eb2618..95ccaadae16 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -111,6 +111,18 @@
             "url": "/_mozilla/mozilla/document_characterSet_invalid.html"
           }
         ],
+        "mozilla/document_characterSet_long.html": [
+          {
+            "path": "mozilla/document_characterSet_long.html",
+            "url": "/_mozilla/mozilla/document_characterSet_long.html"
+          }
+        ],
+        "mozilla/document_characterSet_short.html": [
+          {
+            "path": "mozilla/document_characterSet_short.html",
+            "url": "/_mozilla/mozilla/document_characterSet_short.html"
+          }
+        ],
         "mozilla/document_compatMode_loose.html": [
           {
             "path": "mozilla/document_compatMode_loose.html",
diff --git a/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini b/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini
new file mode 100644
index 00000000000..7a7178ccdbb
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/document_characterSet_long.html.ini
@@ -0,0 +1,4 @@
+[document_characterSet_long.html]
+  type: testharness
+  [Untitled]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini b/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini
new file mode 100644
index 00000000000..4dbc7734960
--- /dev/null
+++ b/tests/wpt/mozilla/meta/mozilla/document_characterSet_short.html.ini
@@ -0,0 +1,4 @@
+[document_characterSet_short.html]
+  type: testharness
+  [Untitled]
+    expected: FAIL
diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html
new file mode 100644
index 00000000000..c420ced2770
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_long.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+    assert_equals(document.characterSet, "windows-1252");
+});
+</script>
diff --git a/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html b/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html
new file mode 100644
index 00000000000..c36b81d3fbe
--- /dev/null
+++ b/tests/wpt/mozilla/tests/mozilla/document_characterSet_short.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta charset="iso-8859-1">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(function() {
+    assert_equals(document.characterSet, "windows-1252");
+});
+</script>
