diff --git a/plugins/ant/tests/data/highlighting/sanity.xml b/plugins/ant/tests/data/highlighting/sanity.xml
index d6793ded52a9..ca2a72092a57 100644
--- a/plugins/ant/tests/data/highlighting/sanity.xml
+++ b/plugins/ant/tests/data/highlighting/sanity.xml
@@ -61,10 +61,6 @@
     <flex destdir="source/com/intellij/lexer"
           flexfile="${basedir}/_ELLexer.flex"/>
   </target>
-  <target name="QL">
-    <flex destdir="EJB/QL/src/com/intellij/ql/psi/impl/lexer"
-          flexfile="${idea.project.home}/EJB/QL/src/com/intellij/ql/psi/impl/lexer/_QlLexer.flex"/>
-  </target>
   <target name="DTD">
     <flex destdir="source/com/intellij/lexer"
           flexfile="${basedir}/_DTDLexer.flex"/>
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 1dfda1b79956..4983fc2a2427 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -111,8 +111,9 @@
                     interface="com.intellij.openapi.compiler.util.InspectionValidator"
                     area="IDEA_PROJECT"/>
 
-    <extensionPoint name="persistenceModel.persistenceModelProvider"
-                    interface="com.intellij.persistenceModel.PersistenceModelProvider"/>
+    <!-- to be moved to a dedicated com.intellij.jpa plugin when available -->
+    <extensionPoint name="jpa.ql.persistenceModelProvider"
+                    interface="com.intellij.jpa.ql.model.PersistenceModelProvider"/>
 
     <extensionPoint name="javaExpressionSurrounder"
                     interface="com.intellij.codeInsight.generation.surroundWith.JavaExpressionSurrounder"/>