diff --git a/tests/Entity/CommentSettingTest.php b/tests/Entity/CommentSettingTest.php
new file mode 100644
index 000000000..29df8b327
--- /dev/null
+++ b/tests/Entity/CommentSettingTest.php
@@ -0,0 +1,28 @@
+<?php namespace Tests;
+
+class CommentSettingTest extends BrowserKitTest {
+  protected $page;
+
+  public function setUp() {
+      parent::setUp();
+      $this->page = \BookStack\Page::first();
+  }
+
+  public function test_comment_disable () {
+    $this->asAdmin();
+
+    $this->setSettings(['app-disable-comments' => 'true']);
+
+    $this->asAdmin()->visit($this->page->getUrl())
+    ->pageNotHasElement('.comments-list');
+  }
+
+  public function test_comment_enable () {
+    $this->asAdmin();
+
+    $this->setSettings(['app-disable-comments' => 'false']);
+
+    $this->asAdmin()->visit($this->page->getUrl())
+    ->pageHasElement('.comments-list');
+  }
+}
\ No newline at end of file