diff --git a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs
index 605f68d782..9dfacb2bf4 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Sorting/PremiereDateComparerTests.cs
@@ -22,32 +22,53 @@ namespace Jellyfin.Server.Implementations.Tests.Sorting
         {
             public PremiereDateTestData()
             {
-                // Both have premier date
+                // Happy case - Both have premier date
                 // Expected: x listed first
                 Add(
-                    new Movie { PremiereDate = new DateTime(2021, 1, 1) },
-                    new Movie { PremiereDate = new DateTime(2021, 1, 3) },
+                    new Movie { PremiereDate = new DateTime(2018, 1, 1) },
+                    new Movie { PremiereDate = new DateTime(2018, 1, 3) },
                     -1);
 
+                // Both have premiere date, but y has invalid date
+                // Expected: y listed first
+                Add(
+                    new Movie { PremiereDate = new DateTime(2019, 1, 1) },
+                    new Movie { PremiereDate = new DateTime(03, 1, 1) },
+                    1);
+
                 // Only x has premiere date, with earlier year than y
                 // Expected: x listed first
                 Add(
-                    new Movie { PremiereDate = new DateTime(2021, 1, 1) },
-                    new Movie { ProductionYear = 2022 },
+                    new Movie { PremiereDate = new DateTime(2020, 1, 1) },
+                    new Movie { ProductionYear = 2021 },
                     -1);
 
                 // Only x has premiere date, with same year as y
                 // Expected: y listed first
                 Add(
-                    new Movie { PremiereDate = new DateTime(2021, 1, 2) },
-                    new Movie { ProductionYear = 2021 },
+                    new Movie { PremiereDate = new DateTime(2022, 1, 2) },
+                    new Movie { ProductionYear = 2022 },
                     1);
 
                 // Only x has a premiere date, with later year than y
                 // Expected: y listed first
                 Add(
-                    new Movie { PremiereDate = new DateTime(2021, 3, 1) },
-                    new Movie { ProductionYear = 2020 },
+                    new Movie { PremiereDate = new DateTime(2024, 3, 1) },
+                    new Movie { ProductionYear = 2023 },
+                    1);
+
+                // Only x has a premiere date, y has an invalid year
+                // Expected: y listed first
+                Add(
+                    new Movie { PremiereDate = new DateTime(2025, 1, 1) },
+                    new Movie { ProductionYear = 0 },
+                    1);
+
+                // Only x has a premiere date, y has neither date nor year
+                // Expected: y listed first
+                Add(
+                    new Movie { PremiereDate = new DateTime(2026, 1, 1) },
+                    new Movie(),
                     1);
             }
         }