diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/Test.java b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/Test.java
new file mode 100644
index 00000000000..fd283abf468
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/Test.java
@@ -0,0 +1 @@
+public class Test { }
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.expected b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.expected
new file mode 100644
index 00000000000..8f3e41e24f0
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.expected
@@ -0,0 +1 @@
+| Test.java:1:14:1:17 | Test |
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.py b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.py
new file mode 100644
index 00000000000..1478610427a
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.py
@@ -0,0 +1,6 @@
+import urllib.request
+from create_database_utils import *
+
+urllib.request.urlretrieve("https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.37.0/ecj-3.37.0.jar", "ecj.jar")
+
+run_codeql_database_create(["java -cp ecj.jar org.eclipse.jdt.internal.compiler.batch.Main -noExit Test.java"], lang="java")
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.ql b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.ql
new file mode 100644
index 00000000000..a61eb5e336a
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample-noexit/test.ql
@@ -0,0 +1,3 @@
+import java
+
+select any(Class c | c.fromSource())
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample/Test.java b/java/ql/integration-tests/all-platforms/java/ecj-sample/Test.java
new file mode 100644
index 00000000000..fd283abf468
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample/Test.java
@@ -0,0 +1 @@
+public class Test { }
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample/test.expected b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.expected
new file mode 100644
index 00000000000..8f3e41e24f0
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.expected
@@ -0,0 +1 @@
+| Test.java:1:14:1:17 | Test |
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample/test.py b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.py
new file mode 100644
index 00000000000..9acadbdb6f1
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.py
@@ -0,0 +1,6 @@
+import urllib.request
+from create_database_utils import *
+
+urllib.request.urlretrieve("https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.37.0/ecj-3.37.0.jar", "ecj.jar")
+
+run_codeql_database_create(["java -cp ecj.jar org.eclipse.jdt.internal.compiler.batch.Main Test.java"], lang="java")
diff --git a/java/ql/integration-tests/all-platforms/java/ecj-sample/test.ql b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.ql
new file mode 100644
index 00000000000..a61eb5e336a
--- /dev/null
+++ b/java/ql/integration-tests/all-platforms/java/ecj-sample/test.ql
@@ -0,0 +1,3 @@
+import java
+
+select any(Class c | c.fromSource())