diff --git a/tests/test_component_logbook.py b/tests/test_component_logbook.py
new file mode 100644
index 00000000000..99b38de1085
--- /dev/null
+++ b/tests/test_component_logbook.py
@@ -0,0 +1,95 @@
+"""
+tests.test_component_logbook
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Tests the logbook component.
+"""
+# pylint: disable=protected-access,too-many-public-methods
+import unittest
+from datetime import timedelta
+
+import homeassistant as ha
+from homeassistant.const import (
+    EVENT_STATE_CHANGED, EVENT_HOMEASSISTANT_START, EVENT_HOMEASSISTANT_STOP)
+import homeassistant.util.dt as dt_util
+from homeassistant.components import logbook, http
+
+from helpers import get_test_home_assistant
+
+
+class TestComponentHistory(unittest.TestCase):
+    """ Tests homeassistant.components.history module. """
+
+    def test_setup(self):
+        """ Test setup method. """
+        try:
+            hass = get_test_home_assistant()
+            http.setup(hass, {})
+            self.assertTrue(logbook.setup(hass, {}))
+        finally:
+            hass.stop()
+
+    def test_humanify_filter_sensor(self):
+        """ Test humanify filter too frequent sensor values. """
+        entity_id = 'sensor.bla'
+
+        pointA = dt_util.strip_microseconds(dt_util.utcnow().replace(minute=2))
+        pointB = pointA.replace(minute=5)
+        pointC = pointA + timedelta(minutes=logbook.GROUP_BY_MINUTES)
+
+        eventA = self.create_state_changed_event(pointA, entity_id, 10)
+        eventB = self.create_state_changed_event(pointB, entity_id, 20)
+        eventC = self.create_state_changed_event(pointC, entity_id, 30)
+
+        entries = list(logbook.humanify((eventA, eventB, eventC)))
+
+        self.assertEqual(2, len(entries))
+        self.assert_entry(
+            entries[0], pointB, 'bla', domain='sensor', entity_id=entity_id)
+
+        self.assert_entry(
+            entries[1], pointC, 'bla', domain='sensor', entity_id=entity_id)
+
+    def test_home_assistant_start_stop_grouped(self):
+        """ Tests if home assistant start and stop events are grouped if
+            occuring in the same minute. """
+        entries = list(logbook.humanify((
+            ha.Event(EVENT_HOMEASSISTANT_STOP),
+            ha.Event(EVENT_HOMEASSISTANT_START),
+            )))
+
+        self.assertEqual(1, len(entries))
+        self.assert_entry(
+            entries[0], name='Home Assistant', message='restarted',
+            domain=ha.DOMAIN)
+
+    def assert_entry(self, entry, when=None, name=None, message=None,
+                     domain=None, entity_id=None):
+        """ Asserts an entry is what is expected """
+        if when:
+            self.assertEqual(when, entry.when)
+
+        if name:
+            self.assertEqual(name, entry.name)
+
+        if message:
+            self.assertEqual(message, entry.message)
+
+        if domain:
+            self.assertEqual(domain, entry.domain)
+
+        if entity_id:
+            self.assertEqual(entity_id, entry.entity_id)
+
+    def create_state_changed_event(self, event_time_fired, entity_id, state):
+        """ Create state changed event. """
+
+        # Logbook only cares about state change events that
+        # contain an old state but will not actually act on it.
+        state = ha.State(entity_id, state).as_dict()
+
+        return ha.Event(EVENT_STATE_CHANGED, {
+            'entity_id': entity_id,
+            'old_state': state,
+            'new_state': state,
+        }, time_fired=event_time_fired)