diff --git a/_SUMMARY.md b/_SUMMARY.md
index 275fe3d2c..6377fb746 100644
--- a/_SUMMARY.md
+++ b/_SUMMARY.md
@@ -72,7 +72,7 @@
         * [Rename Test](rename_test.html)
         * [Folding Test](folding_test.html)
         * [Find Usages Test](find_usages_test.html)
-        * [Commenter Test](TODO)
+        * [Commenter Test](commenter_test.html)
         * [Reference Test](TODO)
 * [Plugin Development FAQ](faq.html)
 
diff --git a/commenter_test.md b/commenter_test.md
new file mode 100644
index 000000000..038047c60
--- /dev/null
+++ b/commenter_test.md
@@ -0,0 +1,38 @@
+---
+title: Commenter Test
+---
+
+<!--
+INITIAL_SOURCE https://confluence.jetbrains.com/display/IntelliJIDEA/Commenter+Test
+-->
+
+# {{ page.title }}
+
+In this test we will check if the commenter, implemented in the
+[Commenter](commenter.html)
+section of the
+[Custom Language Support Tutorial](cls_tutorial.html),
+works as we expect.
+
+### 1. Define a test method
+
+```java
+public void testCommenter() {
+    myFixture.configureByText(SimpleFileType.INSTANCE, "<caret>website = http://en.wikipedia.org/");
+    CommentByLineCommentAction commentAction = new CommentByLineCommentAction();
+    commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+    myFixture.checkResult("#website = http://en.wikipedia.org/");
+    commentAction.actionPerformedImpl(getProject(), myFixture.getEditor());
+    myFixture.checkResult("website = http://en.wikipedia.org/");
+}
+```
+
+### 2. Run the test
+
+Run the test and make sure it's green.
+
+-----
+
+[Previous](find_usages_test.html) [Top](writing_tests_for_plugins.html) [Next](reference_test.html)
+
+
diff --git a/writing_tests_for_plugins.md b/writing_tests_for_plugins.md
index d94407718..435bf3c79 100644
--- a/writing_tests_for_plugins.md
+++ b/writing_tests_for_plugins.md
@@ -22,7 +22,7 @@ and cover its code with functional tests.
 *  [Rename Test](rename_test.html)
 *  [Folding Test](folding_test.html)
 *  [Find Usages Test](find_usages_test.html)
-*  [Commenter Test](TODO)
+*  [Commenter Test](commenter_test.html)
 *  [Reference Test](TODO)
 
 The final code can be found on [GitHub](http://github.com/cheptsov/SimplePlugin).
\ No newline at end of file