diff --git a/gradle.properties b/gradle.properties
index c0b9d6db..5e3ada0d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,6 @@ pluginVersion = 1.0.0
 platformType = IC
 platformVersion = 2025.3.3
 sinceBuild = 253
-untilBuild = 253.*
 
 # === Java ===
 javaVersion = 21
diff --git a/graph-database-plugin/build.gradle b/graph-database-plugin/build.gradle
index 9cdd6568..a869a26d 100644
--- a/graph-database-plugin/build.gradle
+++ b/graph-database-plugin/build.gradle
@@ -36,7 +36,6 @@ intellijPlatform {
 
         ideaVersion {
             sinceBuild = providers.gradleProperty('sinceBuild')
-            untilBuild = providers.gradleProperty('untilBuild')
         }
 
         changeNotes = (providers.provider {
diff --git a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java
index 18e3b7ae..20c0b237 100644
--- a/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java
+++ b/language/cypher/src/main/java/com/github/mdelambilly/graphdbplugin/language/cypher/editor/CypherTypedHandlerDelegate.java
@@ -7,6 +7,7 @@
  */
 package com.github.mdelambilly.graphdbplugin.language.cypher.editor;
 
+import com.github.mdelambilly.graphdbplugin.language.cypher.CypherLanguage;
 import com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.atoms.CypherKeywords;
 import com.github.mdelambilly.graphdbplugin.language.cypher.psi.CypherStringLiteral;
 import com.intellij.codeInsight.editorActions.TypedHandlerDelegate;
@@ -39,6 +40,10 @@ public Result checkAutoPopup(char charTyped, @NotNull Project project, @NotNull
     @NotNull
     @Override
     public Result charTyped(char c, @NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
+        if (!file.getLanguage().isKindOf(CypherLanguage.INSTANCE)) {
+            return Result.CONTINUE;
+        }
+
         if (c != ' ' && c != '\n' && c != '\t' && c != '(' && c != ')' && c != ',' && c != '[' && c != '{') {
             return Result.CONTINUE;
         }
diff --git a/testing/integration-neo4j/build.gradle b/testing/integration-neo4j/build.gradle
index b8f787ae..9060e0b7 100644
--- a/testing/integration-neo4j/build.gradle
+++ b/testing/integration-neo4j/build.gradle
@@ -16,7 +16,6 @@ dependencies {
         bundledPlugin('com.intellij.java')
     }
 
-    testImplementation project(':graph-database-plugin')
     testImplementation project(':ui:jetbrains')
     testImplementation project(':language:cypher')
     testImplementation project(':database:api')
diff --git a/testing/integration-neo4j/src/main/resources/META-INF/plugin.xml b/testing/integration-neo4j/src/main/resources/META-INF/plugin.xml
new file mode 100644
index 00000000..570aac45
--- /dev/null
+++ b/testing/integration-neo4j/src/main/resources/META-INF/plugin.xml
@@ -0,0 +1,125 @@
+<!-- Test plugin descriptor for integration-neo4j tests.
+     Registers all services and extensions required by LightJavaCodeInsightFixtureTestCase tests.
+     The main plugin.xml is not loaded automatically in platform.module test sandboxes. -->
+<idea-plugin>
+    <id>com.github.mdelambilly.jetbrains.graphdbplugin.tests</id>
+    <depends>com.intellij.modules.lang</depends>
+    <depends>com.intellij.modules.java</depends>
+
+    <extensions defaultExtensionNs="com.intellij">
+
+        <!-- Cypher language: file type and parser -->
+        <fileType
+                name="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.file.CypherFileType"
+                fieldName="INSTANCE"
+                language="Cypher"
+                extensions="cyp;cql;cypher"/>
+        <lang.parserDefinition
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.CypherParserDefinition"/>
+        <lang.syntaxHighlighterFactory
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.highlight.CypherSyntaxHighlighterFactory"/>
+        <annotator
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.highlight.CypherSyntaxHighlighterAnnotator"/>
+        <lang.commenter
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.commenter.CypherCommenter"/>
+        <lang.braceMatcher
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.lang.CypherBraceMatcher"/>
+        <lang.namesValidator
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.lang.CypherNameValidator"/>
+        <spellchecker.support
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.lang.CypherSpellcheckingStrategy"/>
+
+        <!-- Completion, references, refactoring -->
+        <completion.contributor
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.completion.CypherCompletionContributor"/>
+        <psi.referenceContributor
+                implementation="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherReferenceContributor"/>
+        <lang.refactoringSupport
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherRefactoringSupportProvider"/>
+        <renameInputValidator
+                implementation="com.github.mdelambilly.graphdbplugin.language.cypher.references.CypherRenameInputValidator"/>
+        <codeInsight.parameterInfo
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.editor.CypherParameterInfoHandler"/>
+
+        <!-- Documentation -->
+        <lang.documentationProvider
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.documentation.CypherDocumentationProvider"/>
+
+        <!-- Formatting -->
+        <lang.formatter
+                language="Cypher"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherFormattingModelBuilder"/>
+        <preFormatProcessor
+                implementation="com.github.mdelambilly.graphdbplugin.language.cypher.formatter.CypherPreFormatter"/>
+        <codeStyleSettingsProvider
+                implementation="com.github.mdelambilly.graphdbplugin.jetbrains.formatter.CypherCodeStyleSettingsProvider"/>
+        <langCodeStyleSettingsProvider
+                implementation="com.github.mdelambilly.graphdbplugin.jetbrains.formatter.CypherLanguageCodeStyleSettingsProvider"/>
+
+        <!-- Typed handler -->
+        <typedHandler
+                implementation="com.github.mdelambilly.graphdbplugin.language.cypher.editor.CypherTypedHandlerDelegate"/>
+
+        <!-- Inspections -->
+        <localInspection
+                language="Cypher"
+                displayName="Cypher EXPLAIN warning inspection"
+                groupPath="Cypher" groupName="General"
+                enabledByDefault="true" level="WARNING"
+                implementationClass="com.github.mdelambilly.graphdbplugin.jetbrains.inspection.CypherExplainWarningInspection"/>
+        <localInspection
+                language="Cypher"
+                displayName="Function call inspection"
+                groupPath="Cypher" groupName="General"
+                enabledByDefault="true" level="ERROR"
+                implementationClass="com.github.mdelambilly.graphdbplugin.language.cypher.inspections.CypherFunctionCallInspection"/>
+
+        <!-- Color settings (needed by some formatting tests) -->
+        <colorSettingsPage
+                implementation="com.github.mdelambilly.graphdbplugin.language.cypher.settings.CypherColorSettingsPage"/>
+
+        <!-- Application services -->
+        <applicationService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponent"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.settings.SettingsComponentImpl"/>
+        <applicationService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.QueryHighlighterComponent"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.highlighter.QueryHighlighterComponentImpl"/>
+        <applicationService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.visualization.services.LookAndFeelService"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.services.IdeaLookAndFeelService"/>
+        <applicationService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.database.DatabaseManagerService"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.database.DatabaseManagerServiceImpl"/>
+        <applicationService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorService"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.services.ExecutorServiceImpl"
+                testServiceImplementation="com.github.mdelambilly.graphdbplugin.test.mocks.service.DummyExecutorService"/>
+
+        <!-- Project services -->
+        <projectService
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.DataSourcesComponent"/>
+        <projectService
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.component.datasource.metadata.DataSourcesComponentMetadata"/>
+        <projectService
+                serviceInterface="com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderService"
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.language.cypher.completion.metadata.CypherMetadataProviderServiceImpl"/>
+        <projectService
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.ui.console.params.ParametersService"/>
+        <projectService
+                serviceImplementation="com.github.mdelambilly.graphdbplugin.jetbrains.database.VersionService"/>
+
+    </extensions>
+</idea-plugin>
\ No newline at end of file