diff --git a/test/formats/test_apev2.py b/test/formats/test_apev2.py
index 90d1d89d2..1de432c6e 100644
--- a/test/formats/test_apev2.py
+++ b/test/formats/test_apev2.py
@@ -173,7 +173,8 @@ class WavPackTest(CommonApeTests.ApeTestCase):
         config.setting['preserve_timestamps'] = False
         config.setting['delete_empty_dirs'] = False
         config.setting['save_images_to_files'] = False
-        config.setting['file_naming_format'] = '%title%'
+        config.setting['file_renaming_scripts'] = {'test_id': {'script': '%title%'}}
+        config.setting['selected_file_naming_script_id'] = 'test_id'
         # Create dummy WavPack correction file
         source_file_wvc = self.filename + 'c'
         open(source_file_wvc, 'a').close()
diff --git a/test/test_file.py b/test/test_file.py
index 608063583..a4aff9f6f 100644
--- a/test/test_file.py
+++ b/test/test_file.py
@@ -185,11 +185,12 @@ class FileNamingTest(PicardTestCase):
             'ascii_filenames': False,
             'clear_existing_tags': False,
             'enabled_plugins': [],
-            'file_naming_format': '%album%/%title%',
             'move_files_to': '/media/music',
             'move_files': False,
             'rename_files': False,
             'windows_compatibility': True,
+            'file_renaming_scripts': {'test_id': {'script': '%album%/%title%'}},
+            'selected_file_naming_script_id': 'test_id',
         })
         self.metadata = Metadata({
             'album': 'somealbum',
@@ -230,7 +231,7 @@ class FileNamingTest(PicardTestCase):
 
     def test_make_filename_empty_script(self):
         config.setting['rename_files'] = True
-        config.setting['file_naming_format'] = '$noop()'
+        config.setting['file_renaming_scripts'] = {'test_id': {'script': '$noop()'}}
         filename = self.file.make_filename(self.file.filename, self.metadata)
         self.assertEqual(os.path.realpath('/somepath/somefile.mp3'), filename)
 
@@ -248,7 +249,7 @@ class FileNamingTest(PicardTestCase):
 
     def test_make_filename_scripted_extension(self):
         config.setting['rename_files'] = True
-        config.setting['file_naming_format'] = '$set(_extension,.foo)%title%'
+        config.setting['file_renaming_scripts'] = {'test_id': {'script': '$set(_extension,.foo)%title%'}}
         filename = self.file.make_filename(self.file.filename, self.metadata)
         self.assertEqual(os.path.realpath('/somepath/sometitle.foo'), filename)