diff --git a/mopidy/backends/__init__.py b/mopidy/backends/__init__.py
index 602777ac..eef0bca0 100644
--- a/mopidy/backends/__init__.py
+++ b/mopidy/backends/__init__.py
@@ -166,7 +166,9 @@ class BaseCurrentPlaylistController(object):
         :param tracks: tracks to load
         :type tracks: list of :class:`mopidy.models.Track`
         """
-        self.tracks = tracks
+        self.tracks = []
+        for track in tracks:
+            self.add(track)
         self.backend.playback.new_playlist_loaded_callback()
 
     def move(self, start, end, to_position):
diff --git a/tests/backends/base.py b/tests/backends/base.py
index 02f9e84c..c7bebf4b 100644
--- a/tests/backends/base.py
+++ b/tests/backends/base.py
@@ -170,9 +170,8 @@ class BaseCurrentPlaylistControllerTest(object):
 
     def test_load_does_not_reset_version(self):
         version = self.controller.version
-
-        self.controller.load(Playlist())
-        self.assertEqual(self.controller.version, version+1)
+        self.controller.load([])
+        self.assertEqual(self.controller.version, version + 1)
 
     @populate_playlist
     def test_load_preserves_playing_state(self):
@@ -608,7 +607,7 @@ class BasePlaybackControllerTest(object):
         wrapper.called = False
 
         self.playback.new_playlist_loaded_callback = wrapper
-        self.backend.current_playlist.load(Playlist())
+        self.backend.current_playlist.load([])
 
         self.assert_(wrapper.called)
 
diff --git a/tests/mpd/frontend_test.py b/tests/mpd/frontend_test.py
index 69a6bbdc..06af5519 100644
--- a/tests/mpd/frontend_test.py
+++ b/tests/mpd/frontend_test.py
@@ -817,9 +817,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
             Track(name='a'), Track(name='b'), Track(name='c'),
             Track(name='d'), Track(name='e'), Track(name='f'),
         ])
-        self.assertEqual(self.b.current_playlist.version, 1)
+        version = self.b.current_playlist.version
         result = self.h.handle_request(u'shuffle')
-        self.assertEqual(self.b.current_playlist.version, 2)
+        self.assert_(version < self.b.current_playlist.version)
         self.assert_(u'OK' in result)
 
     def test_shuffle_with_open_range(self):
@@ -827,9 +827,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
             Track(name='a'), Track(name='b'), Track(name='c'),
             Track(name='d'), Track(name='e'), Track(name='f'),
         ])
-        self.assertEqual(self.b.current_playlist.version, 1)
+        version = self.b.current_playlist.version
         result = self.h.handle_request(u'shuffle "4:"')
-        self.assertEqual(self.b.current_playlist.version, 2)
+        self.assert_(version < self.b.current_playlist.version)
         self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
         self.assertEqual(self.b.current_playlist.tracks[1].name, 'b')
         self.assertEqual(self.b.current_playlist.tracks[2].name, 'c')
@@ -841,9 +841,9 @@ class CurrentPlaylistHandlerTest(unittest.TestCase):
             Track(name='a'), Track(name='b'), Track(name='c'),
             Track(name='d'), Track(name='e'), Track(name='f'),
         ])
-        self.assertEqual(self.b.current_playlist.version, 1)
+        version = self.b.current_playlist.version
         result = self.h.handle_request(u'shuffle "1:3"')
-        self.assertEqual(self.b.current_playlist.version, 2)
+        self.assert_(version < self.b.current_playlist.version)
         self.assertEqual(self.b.current_playlist.tracks[0].name, 'a')
         self.assertEqual(self.b.current_playlist.tracks[3].name, 'd')
         self.assertEqual(self.b.current_playlist.tracks[4].name, 'e')