diff --git a/includes/model/LogEntries_model.php b/includes/model/LogEntries_model.php
index 45ef9f8c..8b7f65a0 100644
--- a/includes/model/LogEntries_model.php
+++ b/includes/model/LogEntries_model.php
@@ -12,7 +12,7 @@ function LogEntry_create($nick, $message) {
 }
 
 /**
- * Returns log entries of the last 24 hours with maximum count of 1000.
+ * Returns log entries with maximum count of 10000.
  */
 function LogEntries() {
   return sql_select("SELECT * FROM `LogEntries` ORDER BY `timestamp` DESC LIMIT 10000");
diff --git a/test/model/LogEntries_model_test.php b/test/model/LogEntries_model_test.php
new file mode 100644
index 00000000..cefc4177
--- /dev/null
+++ b/test/model/LogEntries_model_test.php
@@ -0,0 +1,32 @@
+<?php
+
+class LogEntries_model_test extends PHPUnit_Framework_TestCase {
+
+  public function create_LogEntry() {
+    LogEntry_create('test', 'test');
+  }
+
+  public function test_LogEntry_create() {
+    $count = count(LogEntries());
+    $this->assertNotFalse(LogEntry_create('test', 'test_LogEntry_create'));
+    
+    // There should be one more log entry now
+    $this->assertEquals(count(LogEntries()), $count + 1);
+  }
+
+  public function test_LogEntries_clear_all() {
+    $this->create_LogEntry();
+    $this->assertTrue(count(LogEntries()) > 0);
+    $this->assertNotFalse(LogEntries_clear_all());
+    $this->assertEquals(count(LogEntries()), 0);
+  }
+
+  /**
+   * @after
+   */
+  public function teardown() {
+    LogEntries_clear_all();
+  }
+}
+
+?>
\ No newline at end of file