diff --git a/picard/cluster.py b/picard/cluster.py
index b15092d41..2c47540e8 100644
--- a/picard/cluster.py
+++ b/picard/cluster.py
@@ -342,7 +342,7 @@ class Cluster(FileList):
             if not token:
                 continue
             if not artist:
-                artist = 'Various Artists'
+                artist = config.setting['va_name']
             cluster_list[token].add(album, artist, file)
 
         for cluster in cluster_list.values():
diff --git a/test/test_clustering.py b/test/test_clustering.py
index cf41c7634..cd86edd8d 100644
--- a/test/test_clustering.py
+++ b/test/test_clustering.py
@@ -48,7 +48,8 @@ class ClusterTest(PicardTestCase):
     def setUp(self):
         super().setUp()
         self.set_config_values({
-            'windows_compatibility': False
+            'windows_compatibility': False,
+            'va_name': 'Diverse Interpreten',
         })
 
     def _create_file(self, album, artist, filename="foo.mp3"):
@@ -110,7 +111,7 @@ class ClusterTest(PicardTestCase):
         clusters = list(Cluster.cluster(files))
         self.assertEqual(2, len(clusters))
         self.assertClusterEqual('album1', 'artist1', {files[0], files[2], files[5]}, clusters[0])
-        self.assertClusterEqual('album2', 'Various Artists', {files[1], files[3]}, clusters[1])
+        self.assertClusterEqual('album2', 'Diverse Interpreten', {files[1], files[3]}, clusters[1])
 
     def test_cluster_no_metadata(self):
         files = [