diff --git a/itests/org.openhab.core.model.lsp.tests/itest.bndrun b/itests/org.openhab.core.model.lsp.tests/itest.bndrun
index 070520b445..f93af68bee 100644
--- a/itests/org.openhab.core.model.lsp.tests/itest.bndrun
+++ b/itests/org.openhab.core.model.lsp.tests/itest.bndrun
@@ -9,10 +9,6 @@ Fragment-Host: org.openhab.core.model.lsp
 # done
 #
 -runbundles: \
-	ch.qos.logback.classic;version='[1.2.0,1.2.1)',\
-	ch.qos.logback.core;version='[1.2.0,1.2.1)',\
-	com.google.gson;version='[2.7.0,2.7.1)',\
-	com.google.guava;version='[15.0.0,15.0.1)',\
 	com.google.inject;version='[3.0.0,3.0.1)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
 	joda-time;version='[2.9.2,2.9.3)',\
@@ -25,54 +21,27 @@ Fragment-Host: org.openhab.core.model.lsp
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
-	org.apache.servicemix.bundles.commons-codec;version='[1.3.0,1.3.1)',\
-	org.apache.servicemix.bundles.commons-httpclient;version='[3.1.0,3.1.1)',\
-	org.apache.xbean.bundleutils;version='[4.6.0,4.6.1)',\
-	org.apache.xbean.finder;version='[4.6.0,4.6.1)',\
 	org.eclipse.emf.common;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore;version='[2.12.0,2.12.1)',\
 	org.eclipse.emf.ecore.xmi;version='[2.12.0,2.12.1)',\
-	org.eclipse.equinox.common;version='[3.8.0,3.8.1)',\
-	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.eclipse.jetty.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.proxy;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
-	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.api;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.client;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.websocket.common;version='[9.4.11,9.4.12)',\
 	org.eclipse.jetty.xml;version='[9.4.11,9.4.12)',\
-	org.eclipse.xtend.lib;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtend.lib.macro;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.common.types;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.util;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase;version='[2.14.0,2.14.1)',\
-	org.eclipse.xtext.xbase.lib;version='[2.14.0,2.14.1)',\
 	org.glassfish.hk2.external.aopalliance-repackaged;version='[2.4.0,2.4.1)',\
 	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
-	org.objectweb.asm;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.commons;version='[6.1.1,6.1.2)',\
-	org.objectweb.asm.tree;version='[6.1.1,6.1.2)',\
-	org.openhab.core.compat1x;version='[2.5.0,2.5.1)',\
-	org.ops4j.pax.swissbox.optional.jcl;version='[1.8.2,1.8.3)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-jetty;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-runtime;version='[7.2.3,7.2.4)',\
-	org.ops4j.pax.web.pax-web-spi;version='[7.2.3,7.2.4)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	slf4j.api;version='[1.7.21,1.7.22)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
 	tec.uom.se;version='[1.0.8,1.0.9)',\
 	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
 	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	org.openhab.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.audio;version='[2.5.0,2.5.1)',\
-	org.openhab.core.compat1x.tests;version='[2.5.0,2.5.1)',\
 	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
 	org.openhab.core.io.http;version='[2.5.0,2.5.1)',\
@@ -81,15 +50,45 @@ Fragment-Host: org.openhab.core.model.lsp
 	org.openhab.core.model.item;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.persistence;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.script;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.script.runtime;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.sitemap;version='[2.5.0,2.5.1)',\
 	org.openhab.core.persistence;version='[2.5.0,2.5.1)',\
 	org.openhab.core.scheduler;version='[2.5.0,2.5.1)',\
 	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
-	org.openhab.core.ui;version='[2.5.0,2.5.1)',\
 	org.openhab.core.voice;version='[2.5.0,2.5.1)',\
-	org.openhab.core.model.persistence.runtime;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.rule;version='[2.5.0,2.5.1)',\
 	org.openhab.core.model.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.storage.json;version='[2.5.0,2.5.1)'
+	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	com.google.guava;version='[21.0.0,21.0.1)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
+	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
+	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
+	org.eclipse.emf.ecore.change;version='[2.11.0,2.11.1)',\
+	org.eclipse.equinox.common;version='[3.10.200,3.10.201)',\
+	org.eclipse.lsp4j;version='[0.6.0,0.6.1)',\
+	org.eclipse.lsp4j.jsonrpc;version='[0.6.0,0.6.1)',\
+	org.eclipse.xtend.lib;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtend.lib.macro;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.common.types;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.ide;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.util;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.xbase;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.xbase.ide;version='[2.17.0,2.17.1)',\
+	org.eclipse.xtext.xbase.lib;version='[2.17.0,2.17.1)',\
+	org.objectweb.asm;version='[7.0.0,7.0.1)',\
+	org.objectweb.asm.commons;version='[7.0.0,7.0.1)',\
+	org.objectweb.asm.tree;version='[7.0.0,7.0.1)',\
+	org.openhab.core.model.item.ide;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.lsp;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.lsp.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.persistence.ide;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.rule.ide;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.script.ide;version='[2.5.0,2.5.1)',\
+	org.openhab.core.model.thing.ide;version='[2.5.0,2.5.1)',\
+	slf4j.api;version='[1.7.25,1.7.26)'
diff --git a/itests/org.openhab.core.model.lsp.tests/pom.xml b/itests/org.openhab.core.model.lsp.tests/pom.xml
index 4ae3711b4f..26531143bd 100644
--- a/itests/org.openhab.core.model.lsp.tests/pom.xml
+++ b/itests/org.openhab.core.model.lsp.tests/pom.xml
@@ -11,7 +11,7 @@
 
   <artifactId>org.openhab.core.model.lsp.tests</artifactId>
 
-  <name>openHAB Core :: Integration Tests :: Language Server Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Language Server Protocol Tests</name>
 
   <dependencies>
     <dependency>
diff --git a/itests/pom.xml b/itests/pom.xml
index 4d1296be89..43103d6935 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -48,7 +48,7 @@
     <!-- <module>org.openhab.core.magic.tests</module> -->
     <module>org.openhab.core.model.core.tests</module>
     <!-- <module>org.openhab.core.model.item.tests</module> -->
-    <!-- <module>org.openhab.core.model.lsp.tests</module> -->
+    <module>org.openhab.core.model.lsp.tests</module>
     <module>org.openhab.core.model.persistence.tests</module>
     <!-- <module>org.openhab.core.model.rule.tests</module> -->
     <!-- <module>org.openhab.core.model.script.tests</module> -->