diff --git a/mode/d/test.js b/mode/d/test.js
new file mode 100644
index 0000000000000000000000000000000000000000..d8de4ad35f864903e754f48689111e0e74e93dee
--- /dev/null
+++ b/mode/d/test.js
@@ -0,0 +1,11 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function() {
+  var mode = CodeMirror.getMode({indentUnit: 2}, "d");
+  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
+
+  MT("nested_comments",
+     "[comment /+]","[comment comment]","[comment +/]","[variable void] [variable main](){}");
+
+})();
diff --git a/test/index.html b/test/index.html
index 4146a4d45d2316a728e18fb68037c812d36ad83a..99bee5bb9b91c78b724e0c829cc1ca74cf3d6652 100644
--- a/test/index.html
+++ b/test/index.html
@@ -21,6 +21,7 @@
 <script src="../mode/clike/clike.js"></script>
 <!-- clike must be after css or vim and sublime tests will fail -->
 <script src="../mode/cypher/cypher.js"></script>
+<script src="../mode/d/d.js"></script>
 <script src="../mode/gfm/gfm.js"></script>
 <script src="../mode/haml/haml.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
@@ -115,6 +116,7 @@
     <script src="../mode/css/scss_test.js"></script>
     <script src="../mode/css/less_test.js"></script>
     <script src="../mode/cypher/test.js"></script>
+    <script src="../mode/d/test.js"></script>
     <script src="../mode/gfm/test.js"></script>
     <script src="../mode/haml/test.js"></script>
     <script src="../mode/javascript/test.js"></script>