diff --git a/core/playlists/generic.c b/core/playlists/generic.c
index c92337ba..aeba78c1 100644
--- a/core/playlists/generic.c
+++ b/core/playlists/generic.c
@@ -56,6 +56,7 @@ void playlist_generic_init_sorted(struct playlist  *playlist)
 		playlist_generic_init(playlist);
 		playlist_generic_sort(playlist, COMPARE_ARTIST);
 		playlist_generic_sort(playlist, COMPARE_YEAR);
+		playlist_generic_sort(playlist, COMPARE_ALBUM);
 		playlist_generic_sort(playlist, COMPARE_TRACK);
 	}
 }
diff --git a/tests/core/playlist.c b/tests/core/playlist.c
index de39da39..7ba779bd 100644
--- a/tests/core/playlist.c
+++ b/tests/core/playlist.c
@@ -203,7 +203,7 @@ static void test_sorting()
 	unsigned int i;
 
 	playlist_generic_init_sorted(&p);
-	g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 3);
+	g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 4);
 	playlist_clear_sort(&p);
 	g_assert_cmpuint(g_slist_length(p.pl_sort), ==, 0);
 
diff --git a/tests/core/playlists/library.c b/tests/core/playlists/library.c
index 00134f64..c9f7230f 100644
--- a/tests/core/playlists/library.c
+++ b/tests/core/playlists/library.c
@@ -75,7 +75,7 @@ void test_library()
 	playlist_set_random(playlist, false);
 	g_assert_false(playlist->pl_random);
 
-	g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 3);
+	g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 4);
 	playlist_clear_sort(playlist);
 	g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 0);
 	g_assert_true(playlist_sort(playlist, COMPARE_ARTIST));
diff --git a/tests/core/playlists/system.c b/tests/core/playlists/system.c
index 174701c8..011013ad 100644
--- a/tests/core/playlists/system.c
+++ b/tests/core/playlists/system.c
@@ -44,7 +44,7 @@ static void test_init()
 		if (i == SYS_PL_QUEUED || i == SYS_PL_HISTORY) {
 			g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 0);
 		} else
-			g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 3);
+			g_assert_cmpuint(g_slist_length(playlist->pl_sort), ==, 4);
 	}
 
 	/* Add tracks to the collection. */
diff --git a/tests/gui/treeview.c b/tests/gui/treeview.c
index 155d0798..c4ee90cb 100644
--- a/tests/gui/treeview.c
+++ b/tests/gui/treeview.c
@@ -112,6 +112,7 @@ void test_treeview_sort()
 			break;
 		case GUI_MODEL_ARTIST:
 		case GUI_MODEL_YEAR:
+		case GUI_MODEL_ALBUM:
 		case GUI_MODEL_TRACK_NR:
 			g_assert_true(
 				gtk_tree_view_column_get_sort_indicator(col));