diff --git a/tests/backends/basetests.py b/tests/backends/basetests.py
index b103e337..15513e89 100644
--- a/tests/backends/basetests.py
+++ b/tests/backends/basetests.py
@@ -352,6 +352,12 @@ class BasePlaybackControllerTest(object):
     def test_next_track_empty_playlist(self):
         self.assertEqual(self.playback.next_track, None)
 
+    @populate_playlist
+    def test_next_track_at_end_of_playlist(self):
+        for uri in self.uris:
+            self.playback.next()
+        self.assertEqual(self.playback.next_track, None)
+
     @populate_playlist
     def test_previous_track_before_play(self):
         self.assertEqual(self.playback.previous_track, None)