diff --git a/server/controllers/static.ts b/server/controllers/static.ts
index 7cc7f2c62..4baa31117 100644
--- a/server/controllers/static.ts
+++ b/server/controllers/static.ts
@@ -34,6 +34,7 @@ staticRouter.use(cors())
 */
 
 // FIXME: deprecated in 3.2, use lazy-statics instead
+// Due to historical reasons, we can't really remove this controller
 const torrentsPhysicalPath = CONFIG.STORAGE.TORRENTS_DIR
 staticRouter.use(
   STATIC_PATHS.TORRENTS,
diff --git a/server/lib/thumbnail.ts b/server/lib/thumbnail.ts
index e37aefc85..06066f910 100644
--- a/server/lib/thumbnail.ts
+++ b/server/lib/thumbnail.ts
@@ -74,7 +74,7 @@ function createVideoMiniatureFromUrl (options: {
     ? existingThumbnail.fileUrl
     : null
 
-  // If the thumbnail URL did not change and has a unique filename (introduced in 3.2), avoid thumbnail processing
+  // If the thumbnail URL did not change and has a unique filename (introduced in 3.1), avoid thumbnail processing
   const thumbnailUrlChanged = !existingUrl || existingUrl !== downloadUrl || downloadUrl.endsWith(`${video.uuid}.jpg`)
 
   // Do not change the thumbnail filename if the file did not change
diff --git a/server/lib/video-paths.ts b/server/lib/video-paths.ts
index 0385e89cc..1708c479a 100644
--- a/server/lib/video-paths.ts
+++ b/server/lib/video-paths.ts
@@ -9,7 +9,7 @@ import { isStreamingPlaylist, MStreamingPlaylist, MStreamingPlaylistVideo, MVide
 function generateVideoFilename (videoOrPlaylist: MVideo | MStreamingPlaylistVideo, isHls: boolean, resolution: number, extname: string) {
   const video = extractVideo(videoOrPlaylist)
 
-  // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.2
+  // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.1
   // const uuid = uuidv4()
   const uuid = video.uuid
 
@@ -69,7 +69,7 @@ function generateTorrentFileName (videoOrPlaylist: MVideo | MStreamingPlaylistVi
   const video = extractVideo(videoOrPlaylist)
   const extension = '.torrent'
 
-  // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.2
+  // FIXME: use a generated uuid instead, that will break compatibility with PeerTube < 3.1
   // const uuid = uuidv4()
   const uuid = video.uuid
 
diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts
index 61e7a81ee..80834ca86 100644
--- a/server/tests/api/videos/video-imports.ts
+++ b/server/tests/api/videos/video-imports.ts
@@ -129,8 +129,10 @@ describe('Test video imports', function () {
       const attributes = immutableAssign(baseAttributes, { targetUrl: getYoutubeVideoUrl() })
       const res = await importVideo(servers[0].url, servers[0].accessToken, attributes)
       expect(res.body.video.name).to.equal('small video - youtube')
-      expect(res.body.video.thumbnailPath).to.equal(`/static/thumbnails/${res.body.video.uuid}.jpg`)
-      expect(res.body.video.previewPath).to.equal(`/lazy-static/previews/${res.body.video.uuid}.jpg`)
+
+      expect(res.body.video.thumbnailPath).to.match(new RegExp(`^/static/thumbnails/.+.jpg$`))
+      expect(res.body.video.previewPath).to.match(new RegExp(`^/lazy-static/previews/.+.jpg$`))
+
       await testImage(servers[0].url, 'video_import_thumbnail', res.body.video.thumbnailPath)
       await testImage(servers[0].url, 'video_import_preview', res.body.video.previewPath)
 
@@ -141,7 +143,7 @@ describe('Test video imports', function () {
       const enCaption = videoCaptions.find(caption => caption.language.id === 'en')
       expect(enCaption).to.exist
       expect(enCaption.language.label).to.equal('English')
-      expect(enCaption.captionPath).to.equal(`/lazy-static/video-captions/${res.body.video.uuid}-en.vtt`)
+      expect(enCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-en.vtt$`))
       await testCaptionFile(servers[0].url, enCaption.captionPath, `WEBVTT
 Kind: captions
 Language: en
@@ -158,7 +160,7 @@ Adding subtitles is very easy to do`)
       const frCaption = videoCaptions.find(caption => caption.language.id === 'fr')
       expect(frCaption).to.exist
       expect(frCaption.language.label).to.equal('French')
-      expect(frCaption.captionPath).to.equal(`/lazy-static/video-captions/${res.body.video.uuid}-fr.vtt`)
+      expect(frCaption.captionPath).to.match(new RegExp(`^/lazy-static/video-captions/.+-fr.vtt`))
       await testCaptionFile(servers[0].url, frCaption.captionPath, `WEBVTT
 Kind: captions
 Language: fr
diff --git a/server/tests/fixtures/video_import_preview.jpg b/server/tests/fixtures/video_import_preview.jpg
index 1f8d1d91d..a98da178f 100644
Binary files a/server/tests/fixtures/video_import_preview.jpg and b/server/tests/fixtures/video_import_preview.jpg differ