diff --git a/java/ql/test-kotlin1/justfile b/java/ql/test-kotlin1/justfile
new file mode 100644
index 00000000000..8e9ecc8c925
--- /dev/null
+++ b/java/ql/test-kotlin1/justfile
@@ -0,0 +1,15 @@
+import "../justfile"
+
+base_flags := """\
+    CODEQL_EXTRACTOR_KOTLIN_DIAGNOSTIC_LIMIT= \
+"""
+
+all_checks := default_db_checks + """\
+    --check-undefined-labels \
+    --check-repeated-labels \
+    --check-redefined-labels \
+    --check-use-before-definition \
+    --consistency-queries=""" + consistency_queries
+
+[no-cd]
+test *ARGS=".": (_codeql_test "java" base_flags all_checks ARGS)
diff --git a/java/ql/test-kotlin2/justfile b/java/ql/test-kotlin2/justfile
new file mode 100644
index 00000000000..a1f3170e784
--- /dev/null
+++ b/java/ql/test-kotlin2/justfile
@@ -0,0 +1,16 @@
+import "../justfile"
+
+base_flags := """\
+    CODEQL_EXTRACTOR_KOTLIN_DIAGNOSTIC_LIMIT= \
+    CODEQL_KOTLIN_LEGACY_TEST_EXTRACTION_KOTLIN2=true \
+"""
+
+all_checks := default_db_checks + """\
+    --check-undefined-labels \
+    --check-repeated-labels \
+    --check-redefined-labels \
+    --check-use-before-definition \
+    --consistency-queries=""" + consistency_queries
+
+[no-cd]
+test *ARGS=".": (_codeql_test "java" base_flags all_checks ARGS)