diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/MvelInjection.qhelp b/java/ql/src/Security/CWE/CWE-094/MvelInjection.qhelp
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/MvelInjection.qhelp
rename to java/ql/src/Security/CWE/CWE-094/MvelInjection.qhelp
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/MvelInjection.ql b/java/ql/src/Security/CWE/CWE-094/MvelInjection.ql
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/MvelInjection.ql
rename to java/ql/src/Security/CWE/CWE-094/MvelInjection.ql
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/MvelInjectionLib.qll b/java/ql/src/Security/CWE/CWE-094/MvelInjectionLib.qll
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/MvelInjectionLib.qll
rename to java/ql/src/Security/CWE/CWE-094/MvelInjectionLib.qll
diff --git a/java/ql/src/experimental/Security/CWE/CWE-094/UnsafeMvelExpressionEvaluation.java b/java/ql/src/Security/CWE/CWE-094/UnsafeMvelExpressionEvaluation.java
similarity index 100%
rename from java/ql/src/experimental/Security/CWE/CWE-094/UnsafeMvelExpressionEvaluation.java
rename to java/ql/src/Security/CWE/CWE-094/UnsafeMvelExpressionEvaluation.java
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.qlref b/java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.qlref
deleted file mode 100644
index 13d7cbd2295..00000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-094/MvelInjection.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/options b/java/ql/test/experimental/query-tests/security/CWE-094/options
index 48cc00e0a17..e45718af8ff 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-094/options
+++ b/java/ql/test/experimental/query-tests/security/CWE-094/options
@@ -1,2 +1,2 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.2.3:${testdir}/../../../../stubs/mvel2-2.4.7:${testdir}/../../../../stubs/jsr223-api:${testdir}/../../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../../stubs/scriptengine:${testdir}/../../../../stubs/java-ee-el:${testdir}/../../../../stubs/juel-2.2:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jython-2.7.2:${testdir}/../../../../experimental/stubs/rhino-1.7.13
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.2.3:${testdir}/../../../../stubs/jsr223-api:${testdir}/../../../../stubs/apache-commons-jexl-2.1.1:${testdir}/../../../../stubs/apache-commons-jexl-3.1:${testdir}/../../../../stubs/scriptengine:${testdir}/../../../../stubs/java-ee-el:${testdir}/../../../../stubs/juel-2.2:${testdir}/../../../stubs/groovy-all-3.0.7:${testdir}/../../../../stubs/servlet-api-2.4:${testdir}/../../../../stubs/jython-2.7.2:${testdir}/../../../../experimental/stubs/rhino-1.7.13
 
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.expected b/java/ql/test/query-tests/security/CWE-094/MvelInjection.expected
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.expected
rename to java/ql/test/query-tests/security/CWE-094/MvelInjection.expected
diff --git a/java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.java b/java/ql/test/query-tests/security/CWE-094/MvelInjection.java
similarity index 100%
rename from java/ql/test/experimental/query-tests/security/CWE-094/MvelInjection.java
rename to java/ql/test/query-tests/security/CWE-094/MvelInjection.java
diff --git a/java/ql/test/query-tests/security/CWE-094/MvelInjection.qlref b/java/ql/test/query-tests/security/CWE-094/MvelInjection.qlref
new file mode 100644
index 00000000000..07d8b705dc7
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-094/MvelInjection.qlref
@@ -0,0 +1 @@
+Security/CWE/CWE-094/MvelInjection.ql
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-094/options b/java/ql/test/query-tests/security/CWE-094/options
index 468d90aeabc..4b0f7ffb1f1 100644
--- a/java/ql/test/query-tests/security/CWE-094/options
+++ b/java/ql/test/query-tests/security/CWE-094/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../stubs/validation-api-2.0.1.Final:${testdir}/../../../stubs/mvel2-2.4.7:${testdir}/../../../stubs/scriptengine:${testdir}/../../../stubs/jsr223-api:${testdir}
diff --git a/java/ql/test/stubs/mvel2-2.4.7/org/mvel2/jsr223/MvelCompiledScript.java b/java/ql/test/stubs/mvel2-2.4.7/org/mvel2/jsr223/MvelCompiledScript.java
index a4be37ada32..771f8b83345 100644
--- a/java/ql/test/stubs/mvel2-2.4.7/org/mvel2/jsr223/MvelCompiledScript.java
+++ b/java/ql/test/stubs/mvel2-2.4.7/org/mvel2/jsr223/MvelCompiledScript.java
@@ -3,9 +3,17 @@ package org.mvel2.jsr223;
 import java.io.Serializable;
 import javax.script.CompiledScript;
 import javax.script.ScriptContext;
+import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
 public class MvelCompiledScript extends CompiledScript {
   public MvelCompiledScript(MvelScriptEngine engine, Serializable compiledScript) {}
-  public Object eval(ScriptContext context) throws ScriptException { return null; }
-}
\ No newline at end of file
+
+  public Object eval(ScriptContext context) throws ScriptException {
+    return null;
+  }
+
+  public ScriptEngine getEngine() {
+    return null;
+  }
+}