diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected
new file mode 100644
index 000000000000..c9e472ebeb60
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.expected
@@ -0,0 +1,3 @@
+| Frontend errors in file:  (2 errors during annotation processing) | 2 |
+| Frontend errors in file: Test.java (7 javac errors) | 2 |
+| Unknown errors in file: Test.java (5) | 2 |
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref
new file mode 100644
index 000000000000..488db09ab058
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/ExtractionErrors.qlref
@@ -0,0 +1 @@
+Diagnostics/ExtractionErrors.ql
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java
new file mode 100644
index 000000000000..e1df4c2a42f8
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/Test.java
@@ -0,0 +1,35 @@
+// The import below is intentionally commented out to test buildless recovery.
+// import java.util.stream.Stream;
+
+public class LambdaBuildlessRecoveryTest {
+
+    private Stream<String> getStringStream() {
+        return getStringStream();
+    }
+
+    public void testSimpleLambdaExpression() {
+        int unused = 0;
+        Stream<String> s = getStringStream();
+        Stream<String> mapped = s.map(x -> x);
+        mapped.forEach(System.out::println);
+    }
+
+    public void testLambdaWithBlockBody() {
+        int unused = 42;
+        Stream<String> s = getStringStream();
+        Stream<String> filtered = s.filter(item -> {
+            int unused = 42;
+            String proc = item.toUpperCase();
+            return proc.length() > 0;
+        });
+        filtered.forEach(System.out::println);
+    }
+
+    public void testVariableCapture() {
+        int unused = 99;
+        String prefix = "proc_";
+        Stream<String> s = getStringStream();
+        Stream<String> result = s.map(item -> prefix + item);
+        result.forEach(System.out::println);
+    }
+}
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py
new file mode 100755
index 000000000000..773127096a75
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/test.py
@@ -0,0 +1,5 @@
+def test(codeql, java, use_java_17):
+    codeql.database.create(
+        build_mode="none",
+        source_root="."
+    )
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected
new file mode 100644
index 000000000000..282d65e7e63f
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.expected
@@ -0,0 +1,4 @@
+| Test.java:11:9:11:23 | int unused |
+| Test.java:18:9:18:24 | int unused |
+| Test.java:21:13:21:28 | int unused |
+| Test.java:29:9:29:24 | int unused |
\ No newline at end of file
diff --git a/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql
new file mode 100644
index 000000000000..cba463c08273
--- /dev/null
+++ b/java/ql/integration-tests/java/lambda-expression-buildless-recovery/unused_variable.ql
@@ -0,0 +1,5 @@
+import java
+
+from LocalVariableDecl v
+where not exists(v.getAnAccess()) and exists(v.getFile().getRelativePath())
+select v