diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/diagnostics.expected b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/diagnostics.expected
new file mode 100644
index 00000000000..3494b6a6f7d
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/diagnostics.expected
@@ -0,0 +1,14 @@
+{
+  "markdownMessage": "The Kotlin version installed (`999.999.999`) is too recent for this version of CodeQL. Install a version lower than 1.8.30",
+  "severity": "error",
+  "source": {
+    "extractorName": "java",
+    "id": "java/extractor-agent/kotlin-version-too-new",
+    "name": "Android build failure"
+  },
+  "visibility": {
+    "cliSummaryTable": true,
+    "statusPage": true,
+    "telemetry": true
+  }
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/mock/MockProject.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/mock/MockProject.java
new file mode 100644
index 00000000000..75eaf862803
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/mock/MockProject.java
@@ -0,0 +1,3 @@
+package com.intellij.mock;
+
+public class MockProject { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/openapi/Disposable.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/openapi/Disposable.java
new file mode 100644
index 00000000000..c4c7538d732
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/com/intellij/openapi/Disposable.java
@@ -0,0 +1,3 @@
+package com.intellij.openapi;
+
+public class Disposable { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/driver/Main.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/driver/Main.java
new file mode 100644
index 00000000000..8a2c7b74ed7
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/driver/Main.java
@@ -0,0 +1,20 @@
+package driver;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments;
+import org.jetbrains.kotlin.cli.common.arguments.ParseCommandLineArgumentsKt;
+import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
+
+public class Main {
+
+  public static void main(String[] args) {
+
+    List<String> compilerArgs = new ArrayList<String>();
+    K2JVMCompilerArguments parsedArgs = new K2JVMCompilerArguments();
+    (new ParseCommandLineArgumentsKt()).parseCommandLineArguments(compilerArgs, parsedArgs);
+    (new K2JVMCompiler()).doExecute(parsedArgs, null, null, null);
+
+  }
+
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/kotlin/KotlinVersion.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/kotlin/KotlinVersion.java
new file mode 100644
index 00000000000..e4bd4ecb7e1
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/kotlin/KotlinVersion.java
@@ -0,0 +1,7 @@
+package kotlin;
+
+public class KotlinVersion {
+
+  public static String CURRENT = "999.999.999";
+
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/ExitCode.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/ExitCode.java
new file mode 100644
index 00000000000..017c62b8d12
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/ExitCode.java
@@ -0,0 +1,3 @@
+package org.jetbrains.kotlin.cli.common;
+
+public class ExitCode { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/CommonToolArguments.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/CommonToolArguments.java
new file mode 100644
index 00000000000..fda9bc15320
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/CommonToolArguments.java
@@ -0,0 +1,3 @@
+package org.jetbrains.kotlin.cli.common.arguments;
+
+class CommonToolArguments { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
new file mode 100644
index 00000000000..68a08768490
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java
@@ -0,0 +1,3 @@
+package org.jetbrains.kotlin.cli.common.arguments;
+
+public class K2JVMCompilerArguments extends CommonToolArguments { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/ParseCommandLineArgumentsKt.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/ParseCommandLineArgumentsKt.java
new file mode 100644
index 00000000000..3aa2a64dcee
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/common/arguments/ParseCommandLineArgumentsKt.java
@@ -0,0 +1,7 @@
+package org.jetbrains.kotlin.cli.common.arguments;
+
+public class ParseCommandLineArgumentsKt { 
+
+  public void parseCommandLineArguments(java.util.List p0, org.jetbrains.kotlin.cli.common.arguments.CommonToolArguments p1) { }
+
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
new file mode 100644
index 00000000000..4ac8813e1d6
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
@@ -0,0 +1,9 @@
+package org.jetbrains.kotlin.cli.jvm;
+
+public class K2JVMCompiler { 
+
+  public org.jetbrains.kotlin.cli.common.ExitCode doExecute(org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments p0, org.jetbrains.kotlin.config.CompilerConfiguration p1, com.intellij.openapi.Disposable p2, org.jetbrains.kotlin.utils.KotlinPaths p3) {
+    return null;
+  }
+
+}
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/config/CompilerConfiguration.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/config/CompilerConfiguration.java
new file mode 100644
index 00000000000..36bbae2044d
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/config/CompilerConfiguration.java
@@ -0,0 +1,3 @@
+package org.jetbrains.kotlin.config;
+
+public class CompilerConfiguration { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/utils/KotlinPaths.java b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/utils/KotlinPaths.java
new file mode 100644
index 00000000000..82babe67d77
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/fake-kotlinc-source/org/jetbrains/kotlin/utils/KotlinPaths.java
@@ -0,0 +1,3 @@
+package org.jetbrains.kotlin.utils;
+
+public class KotlinPaths { }
diff --git a/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/test.py b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/test.py
new file mode 100644
index 00000000000..484ea6c0486
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/kotlin/diagnostics/kotlin-version-too-new/test.py
@@ -0,0 +1,11 @@
+from create_database_utils import *
+from diagnostics_test_utils import *
+
+import glob
+import os.path
+
+os.mkdir('fake-kotlinc-classes')
+runSuccessfully(["javac"] + [os.path.relpath(x, "fake-kotlinc-source") for x in glob.glob("fake-kotlinc-source/**/*.java", recursive = True)] + ["-d", "../fake-kotlinc-classes"], cwd = "fake-kotlinc-source")
+run_codeql_database_create(["java -cp fake-kotlinc-classes driver.Main"], lang = "java", runFunction = runUnsuccessfully, db = None)
+
+check_diagnostics()