diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py
index 7317550e..a8afebd3 100644
--- a/mopidy/core/playback.py
+++ b/mopidy/core/playback.py
@@ -336,7 +336,7 @@ class PlaybackController(object):
 
         if not pending_tl_track:
             self.stop()
-            self._on_end_of_stream()  # pretend and EOS happend for cleanup
+            self._on_end_of_stream()  # pretend an EOS happened for cleanup
             return True
 
         backend = self._get_backend(pending_tl_track)
diff --git a/tests/core/test_playback.py b/tests/core/test_playback.py
index 23a9845d..60a3f612 100644
--- a/tests/core/test_playback.py
+++ b/tests/core/test_playback.py
@@ -13,9 +13,10 @@ from mopidy.models import Track
 from tests import dummy_audio
 
 
-# TODO: Replace this with dummy_backend no that it uses a real playbackprovider
-# Since we rely on our DummyAudio to actually emit events we need a "real"
-# backend and not a mock so the right calls make it through to audio.
+# TODO: Replace this with dummy_backend now that it uses a real
+# playbackprovider Since we rely on our DummyAudio to actually emit events we
+# need a "real" backend and not a mock so the right calls make it through to
+# audio.
 class TestBackend(pykka.ThreadingActor, backend.Backend):
     uri_schemes = ['dummy']