diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
index 2de9193015d..770e1429af4 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
@@ -35881,6 +35881,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
             runTest("compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt");
         }
 
+        @Test
+        @TestMetadata("incorrectComparatorInvocation.kt")
+        public void testIncorrectComparatorInvocation() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt");
+        }
+
         @Test
         @TestMetadata("instar.kt")
         public void testInstar() throws Exception {
diff --git a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
index 5f06351a449..27e6005eb03 100644
--- a/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
+++ b/analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
@@ -35881,6 +35881,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
             runTest("compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt");
         }
 
+        @Test
+        @TestMetadata("incorrectComparatorInvocation.kt")
+        public void testIncorrectComparatorInvocation() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt");
+        }
+
         @Test
         @TestMetadata("instar.kt")
         public void testInstar() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
index 53f5d868872..4dffa06ac4b 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
@@ -35881,6 +35881,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
             runTest("compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt");
         }
 
+        @Test
+        @TestMetadata("incorrectComparatorInvocation.kt")
+        public void testIncorrectComparatorInvocation() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt");
+        }
+
         @Test
         @TestMetadata("instar.kt")
         public void testInstar() throws Exception {
diff --git a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
index 4b014f0d10d..2e034534aeb 100644
--- a/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
+++ b/compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
@@ -35977,6 +35977,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
             runTest("compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt");
         }
 
+        @Test
+        @TestMetadata("incorrectComparatorInvocation.kt")
+        public void testIncorrectComparatorInvocation() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt");
+        }
+
         @Test
         @TestMetadata("instar.kt")
         public void testInstar() throws Exception {
diff --git a/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.fir.kt b/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.fir.kt
new file mode 100644
index 00000000000..fbcea7eb7b6
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.fir.kt
@@ -0,0 +1,5 @@
+// ISSUE: KT-54874
+
+fun main(args: Array<String>) {
+    val comparator = <!NO_COMPANION_OBJECT!>Comparator<Long?><!>
+}
\ No newline at end of file
diff --git a/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt b/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt
new file mode 100644
index 00000000000..6743d8f3fcd
--- /dev/null
+++ b/compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt
@@ -0,0 +1,5 @@
+// ISSUE: KT-54874
+
+fun main(args: Array<String>) {
+    val comparator = <!FUNCTION_CALL_EXPECTED!><!NO_VALUE_FOR_PARAMETER!>Comparator<!><Long?><!>
+}
diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
index 38324240fa6..bed0962eeb3 100644
--- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
+++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
@@ -36749,6 +36749,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
             runTest("compiler/testData/diagnostics/testsWithStdLib/InaccessibleInternalClass.kt");
         }
 
+        @Test
+        @TestMetadata("incorrectComparatorInvocation.kt")
+        public void testIncorrectComparatorInvocation() throws Exception {
+            runTest("compiler/testData/diagnostics/testsWithStdLib/incorrectComparatorInvocation.kt");
+        }
+
         @Test
         @TestMetadata("instar.kt")
         public void testInstar() throws Exception {