diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs
index f412fd57570..c4bd0bfd173 100644
--- a/components/script/dom/htmldataelement.rs
+++ b/components/script/dom/htmldataelement.rs
@@ -3,6 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use dom::bindings::codegen::Bindings::HTMLDataElementBinding;
+use dom::bindings::codegen::Bindings::HTMLDataElementBinding::HTMLDataElementMethods;
 use dom::bindings::js::Root;
 use dom::bindings::str::DOMString;
 use dom::document::Document;
@@ -33,3 +34,11 @@ impl HTMLDataElement {
                            HTMLDataElementBinding::Wrap)
     }
 }
+
+impl HTMLDataElementMethods for HTMLDataElement {
+    // https://html.spec.whatwg.org/multipage/#dom-data-value
+    make_getter!(Value, "value");
+
+    // https://html.spec.whatwg.org/multipage/#dom-data-value
+    make_setter!(SetValue, "value");
+}
diff --git a/components/script/dom/webidls/HTMLDataElement.webidl b/components/script/dom/webidls/HTMLDataElement.webidl
index be932250678..658f5274491 100644
--- a/components/script/dom/webidls/HTMLDataElement.webidl
+++ b/components/script/dom/webidls/HTMLDataElement.webidl
@@ -4,5 +4,5 @@
 
 // https://html.spec.whatwg.org/multipage/#htmldataelement
 interface HTMLDataElement : HTMLElement {
-  //         attribute DOMString value;
+           attribute DOMString value;
 };
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index b5a1aadce9e..6c9c977a95b 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -37232,6 +37232,12 @@
             "path": "html/semantics/tabular-data/the-table-element/remove-row.html",
             "url": "/html/semantics/tabular-data/the-table-element/remove-row.html"
           }
+        ],
+        "html/semantics/text-level-semantics/the-data-element/data.value-001.html": [
+          {
+            "path": "html/semantics/text-level-semantics/the-data-element/data.value-001.html",
+            "url": "/html/semantics/text-level-semantics/the-data-element/data.value-001.html"
+          }
         ]
       }
     },
diff --git a/tests/wpt/metadata/html/dom/interfaces.html.ini b/tests/wpt/metadata/html/dom/interfaces.html.ini
index 9934d8567d6..73a575bfc98 100644
--- a/tests/wpt/metadata/html/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.html.ini
@@ -1617,12 +1617,6 @@
   [HTMLAnchorElement interface: document.createElement("a") must inherit property "charset" with the proper type (9)]
     expected: FAIL
 
-  [HTMLDataElement interface: attribute value]
-    expected: FAIL
-
-  [HTMLDataElement interface: document.createElement("data") must inherit property "value" with the proper type (0)]
-    expected: FAIL
-
   [HTMLTimeElement interface: attribute dateTime]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/reflection-text.html.ini b/tests/wpt/metadata/html/dom/reflection-text.html.ini
index 7d13d5b78d5..cfe875b6f19 100644
--- a/tests/wpt/metadata/html/dom/reflection-text.html.ini
+++ b/tests/wpt/metadata/html/dom/reflection-text.html.ini
@@ -7839,135 +7839,6 @@
   [data.tabIndex: IDL set to -2147483648 followed by getAttribute()]
     expected: FAIL
 
-  [data.value: typeof IDL attribute]
-    expected: FAIL
-
-  [data.value: IDL get with DOM attribute unset]
-    expected: FAIL
-
-  [data.value: setAttribute() to "" followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo " followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to undefined followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to 7 followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to 1.5 followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to true followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to false followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to object "[object Object\]" followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to NaN followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to Infinity followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to -Infinity followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to "\\0" followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to null followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to object "test-toString" followed by IDL get]
-    expected: FAIL
-
-  [data.value: setAttribute() to object "test-valueOf" followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to "" followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to " \\0\\x01\\x02\\x03\\x04\\x05\\x06\\x07 \\b\\t\\n\\v\\f\\r\\x0e\\x0f \\x10\\x11\\x12\\x13\\x14\\x15\\x16\\x17 \\x18\\x19\\x1a\\x1b\\x1c\\x1d\\x1e\\x1f  foo " followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to undefined followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to undefined followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to 7 followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to 7 followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to 1.5 followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to 1.5 followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to true followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to true followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to false followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to false followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to object "[object Object\]" followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to object "[object Object\]" followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to NaN followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to NaN followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to Infinity followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to Infinity followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to -Infinity followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to -Infinity followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to "\\0" followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to null followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to null followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to object "test-toString" followed by getAttribute()]
-    expected: FAIL
-
-  [data.value: IDL set to object "test-toString" followed by IDL get]
-    expected: FAIL
-
-  [data.value: IDL set to object "test-valueOf" followed by IDL get]
-    expected: FAIL
-
   [data.itemScope: typeof IDL attribute]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html b/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html
new file mode 100644
index 00000000000..9fc827b9b88
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/text-level-semantics/the-data-element/data.value-001.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>HTMLDataElement.value getting</title>
+        <link rel="author" title="ofekd" href="mailto:ofek@outlook.com">
+        <link rel="help" href="https://html.spec.whatwg.org/multipage/semantics.html#dom-data-value">
+        <script src=/resources/testharness.js></script>
+        <script src=/resources/testharnessreport.js></script>
+    </head>
+    <body>
+        <div id="log"></div>
+        <div id="container">
+            <data value=""></data>
+            <data value="40">Forty</data>
+        </div>
+        <script>
+            var newData, datasArr, container;
+
+            container = document.getElementById('container')
+
+            newData = document.createElement('data');
+            newData.textContent = 'Five';
+            newData.setAttribute('value', '5');
+            container.appendChild(newData);
+
+            datasArr = container.getElementsByTagName('data');
+
+            test(function () {
+                test(function() {
+                    assert_equals(datasArr[0].value, '');
+                }, 'data[value] #0 getter test');
+
+                test(function() {
+                    assert_equals(datasArr[1].value, '40');
+                }, 'data[value] #1 getter test');
+
+                test(function() {
+                    assert_equals(datasArr[2].value, '5');
+                }, 'data[value] #2 getter test');
+            }, 'Getter tests');
+
+            test(function () {
+                var i;
+
+                for (i = 0; i < datasArr.length; i++) {
+                    datasArr[i].textContent = 'Twenty';
+                    datasArr[i].value = 20;
+
+                    test(function() {
+                        assert_equals(datasArr[i].getAttribute('value'), '20');
+                    }, 'data[value] #' + i + ' setter test');
+                }
+
+                newData = document.createElement('data');
+                newData.textContent = 'Twenty';
+                newData.value = '20';
+                container.appendChild(newData);
+
+                test(function() {
+                    assert_equals(datasArr[3].getAttribute('value'), '20');
+                }, 'data[value] #3 setter test');
+
+            }, 'Setter tests');
+        </script>
+    </body>
+</html>