diff --git a/src/components/script/dom/node.rs b/src/components/script/dom/node.rs
index 3ce69d356b7..9999503a758 100644
--- a/src/components/script/dom/node.rs
+++ b/src/components/script/dom/node.rs
@@ -924,9 +924,16 @@ impl Node {
     }
 
     // http://dom.spec.whatwg.org/#dom-node-nodevalue
-    pub fn SetNodeValue(&mut self, _abstract_self: &JS<Node>, _val: Option<DOMString>)
+    pub fn SetNodeValue(&mut self, abstract_self: &mut JS<Node>, val: Option<DOMString>)
                         -> ErrorResult {
-        // FIXME (#1825) implement.
+        match self.type_id {
+            CommentNodeTypeId |
+            TextNodeTypeId |
+            ProcessingInstructionNodeTypeId => {
+                self.SetTextContent(abstract_self, val);
+            }
+            _ => {}
+        }
         Ok(())
     }
 
diff --git a/src/test/html/content/test_document_set_node_value.html b/src/test/html/content/test_document_set_node_value.html
new file mode 100644
index 00000000000..20762a93674
--- /dev/null
+++ b/src/test/html/content/test_document_set_node_value.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <script src="harness.js"></script>
+  <body>
+    <div id="div" class="div-class">A</div>
+    <p>P</p>
+    <script>
+      is(document.nodeValue, null);
+      var div = document.getElementById("div");
+      is(div.nodeValue, null);
+      is(div.firstChild.nodeValue, "A");
+      div.firstChild.nodeValue = "B";
+      is(div.firstChild.nodeValue, "B");
+      var commentNode = document.createComment("comment node");
+      is(commentNode.nodeValue, "comment node");
+      finish();
+    </script>
+  </body>
+</html>
