diff --git a/test/test_mpdstats.py b/test/test_mpdstats.py
index 9d7d16881..f28e29d68 100644
--- a/test/test_mpdstats.py
+++ b/test/test_mpdstats.py
@@ -17,7 +17,7 @@ from __future__ import (division, absolute_import, print_function,
                         unicode_literals)
 
 
-from mock import Mock
+from mock import Mock, patch, call, ANY
 from test._common import unittest
 from test.helper import TestHelper
 
@@ -44,6 +44,44 @@ class MPDStatsTest(unittest.TestCase, TestHelper):
         self.assertFalse(mpdstats.update_rating(item, True))
         self.assertFalse(mpdstats.update_rating(None, True))
 
+    def test_get_item(self):
+        ITEM_PATH = '/foo/bar.flac'
+        item = Item(title='title', path=ITEM_PATH, id=1)
+        item.add(self.lib)
+
+        log = Mock()
+        mpdstats = MPDStats(self.lib, log)
+
+        self.assertEqual(str(mpdstats.get_item(ITEM_PATH)), str(item))
+        self.assertIsNone(mpdstats.get_item('/some/non-existing/path'))
+        self.assertIn('item not found:', log.info.call_args[0][0])
+
+    FAKE_UNKNOWN_STATE = 'some-unknown-one'
+    STATUSES = [{'state': FAKE_UNKNOWN_STATE},
+                {'state': 'pause'},
+                {'state': 'play', 'songid': 1, 'time': '0:1'},
+                {'state': 'stop'}]
+    EVENTS = [["player"]] * (len(STATUSES) - 1) + [KeyboardInterrupt]
+    ITEM_PATH = '/foo/bar.flac'
+
+    @patch("beetsplug.mpdstats.MPDClientWrapper", return_value=Mock(**{
+        "events.side_effect": EVENTS, "status.side_effect": STATUSES,
+        "playlist.return_value": {1: ITEM_PATH}}))
+    def test_run_MPDStats(self, mpd_mock):
+        item = Item(title='title', path=self.ITEM_PATH, id=1)
+        item.add(self.lib)
+
+        log = Mock()
+        try:
+            MPDStats(self.lib, log).run()
+        except KeyboardInterrupt:
+            pass
+
+        log.debug.assert_has_calls(
+            [call(u'unhandled status "{0}"', ANY)])
+        log.info.assert_has_calls(
+            [call(u'pause'), call(u'playing {0}', ANY), call(u'stop')])
+
 
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)