diff --git a/itests/org.openhab.binding.astro.tests/itest.bndrun b/itests/org.openhab.binding.astro.tests/itest.bndrun
index 183e767b2..9abb04967 100644
--- a/itests/org.openhab.binding.astro.tests/itest.bndrun
+++ b/itests/org.openhab.binding.astro.tests/itest.bndrun
@@ -10,21 +10,13 @@ Fragment-Host: org.openhab.binding.astro
 #
 -runbundles: \
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	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.config.core;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
@@ -34,16 +26,22 @@ Fragment-Host: org.openhab.binding.astro
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
-	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
-	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
-	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
-	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
-	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
-	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
-	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.binding.astro;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.astro.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-jupiter-params;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.astro;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.astro.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.storage.json;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java
index d094622c8..e36fff89a 100644
--- a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java
+++ b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroCommandTest.java
@@ -19,6 +19,10 @@ import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 
 import java.time.ZoneId;
 
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.SunHandler;
+import org.openhab.binding.astro.internal.model.Sun;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.scheduler.CronScheduler;
@@ -30,10 +34,6 @@ import org.openhab.core.thing.binding.ThingHandlerCallback;
 import org.openhab.core.thing.binding.builder.ChannelBuilder;
 import org.openhab.core.types.RefreshType;
 import org.openhab.core.types.State;
-import org.junit.jupiter.api.Test;
-import org.openhab.binding.astro.internal.handler.AstroThingHandler;
-import org.openhab.binding.astro.internal.handler.SunHandler;
-import org.openhab.binding.astro.internal.model.Sun;
 
 /**
  * OSGi test for the {@link AstroThingHandler}
diff --git a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java
index 44093468f..718dd4cc9 100644
--- a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java
+++ b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/handler/test/AstroValidConfigurationTest.java
@@ -18,6 +18,9 @@ import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 
 import java.time.ZoneId;
 
+import org.junit.jupiter.api.Test;
+import org.openhab.binding.astro.internal.handler.AstroThingHandler;
+import org.openhab.binding.astro.internal.handler.SunHandler;
 import org.openhab.core.config.core.Configuration;
 import org.openhab.core.i18n.TimeZoneProvider;
 import org.openhab.core.scheduler.CronScheduler;
@@ -28,9 +31,6 @@ import org.openhab.core.thing.ThingStatusInfo;
 import org.openhab.core.thing.ThingUID;
 import org.openhab.core.thing.binding.ThingHandler;
 import org.openhab.core.thing.binding.ThingHandlerCallback;
-import org.junit.jupiter.api.Test;
-import org.openhab.binding.astro.internal.handler.AstroThingHandler;
-import org.openhab.binding.astro.internal.handler.SunHandler;
 
 /**
  * Tests for the {@link AstroThingHandler}
diff --git a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/test/cases/AstroParametrizedTestCases.java b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/test/cases/AstroParametrizedTestCases.java
index c3439edfe..b2852c9b6 100644
--- a/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/test/cases/AstroParametrizedTestCases.java
+++ b/itests/org.openhab.binding.astro.tests/src/main/java/org/openhab/binding/astro/test/cases/AstroParametrizedTestCases.java
@@ -17,10 +17,10 @@ import static org.openhab.binding.astro.test.cases.AstroBindingTestsData.*;
 import java.util.Arrays;
 import java.util.List;
 
+import org.openhab.binding.astro.test.AstroStateTest;
 import org.openhab.core.library.types.DateTimeType;
 import org.openhab.core.library.types.QuantityType;
 import org.openhab.core.library.unit.SmartHomeUnits;
-import org.openhab.binding.astro.test.AstroStateTest;
 
 /**
  * Test cases used in the {@link AstroStateTest}
diff --git a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
index 40c387733..dd9b925bd 100644
--- a/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
+++ b/itests/org.openhab.binding.avmfritz.tests/itest.bndrun
@@ -10,27 +10,14 @@ Fragment-Host: org.openhab.binding.avmfritz
 #
 -runbundles: \
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	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.config.core;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.jupnp;version='[2.5.2,2.5.3)',\
-	org.openhab.core.config.discovery.upnp;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
@@ -41,9 +28,6 @@ Fragment-Host: org.openhab.binding.avmfritz
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
 	org.objectweb.asm;version='[7.1.0,7.1.1)',\
 	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
 	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -60,5 +44,25 @@ Fragment-Host: org.openhab.binding.avmfritz
 	org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.avmfritz;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.avmfritz.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.avmfritz;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.avmfritz.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery.upnp;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.net;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzDiscoveryServiceOSGiTest.java b/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzDiscoveryServiceOSGiTest.java
index 9ada1136c..c6d988714 100644
--- a/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzDiscoveryServiceOSGiTest.java
+++ b/itests/org.openhab.binding.avmfritz.tests/src/main/java/org/openhab/binding/avmfritz/internal/discovery/AVMFritzDiscoveryServiceOSGiTest.java
@@ -12,9 +12,9 @@
  */
 package org.openhab.binding.avmfritz.internal.discovery;
 
-import static org.openhab.core.thing.Thing.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.openhab.binding.avmfritz.internal.AVMFritzBindingConstants.*;
+import static org.openhab.core.thing.Thing.*;
 
 import java.io.StringReader;
 import java.util.Collection;
@@ -25,12 +25,6 @@ import javax.xml.bind.Unmarshaller;
 
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
-import org.openhab.core.config.discovery.DiscoveryListener;
-import org.openhab.core.config.discovery.DiscoveryResult;
-import org.openhab.core.config.discovery.DiscoveryResultFlag;
-import org.openhab.core.config.discovery.DiscoveryService;
-import org.openhab.core.thing.ThingTypeUID;
-import org.openhab.core.thing.ThingUID;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -38,6 +32,12 @@ import org.openhab.binding.avmfritz.internal.dto.AVMFritzBaseModel;
 import org.openhab.binding.avmfritz.internal.dto.DeviceListModel;
 import org.openhab.binding.avmfritz.internal.handler.AVMFritzThingHandlerOSGiTest;
 import org.openhab.binding.avmfritz.internal.util.JAXBUtils;
+import org.openhab.core.config.discovery.DiscoveryListener;
+import org.openhab.core.config.discovery.DiscoveryResult;
+import org.openhab.core.config.discovery.DiscoveryResultFlag;
+import org.openhab.core.config.discovery.DiscoveryService;
+import org.openhab.core.thing.ThingTypeUID;
+import org.openhab.core.thing.ThingUID;
 
 /**
  * Tests for {@link AVMFritzDiscoveryService}.
diff --git a/itests/org.openhab.binding.feed.tests/itest.bndrun b/itests/org.openhab.binding.feed.tests/itest.bndrun
index fd6400e6a..df05c37a3 100644
--- a/itests/org.openhab.binding.feed.tests/itest.bndrun
+++ b/itests/org.openhab.binding.feed.tests/itest.bndrun
@@ -21,22 +21,11 @@ Fragment-Host: org.openhab.binding.feed
 	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
 	org.apache.xbean.bundleutils;version='[4.12.0,4.12.1)',\
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.apache.commons.io;version='[2.2.0,2.2.1)',\
@@ -62,5 +51,21 @@ Fragment-Host: org.openhab.binding.feed
 	org.ops4j.pax.web.pax-web-spi;version='[7.2.11,7.2.12)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.feed;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.feed.tests;version='[2.5.9,2.5.10)',\
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.openhab.binding.feed;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.feed.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
\ No newline at end of file
diff --git a/itests/org.openhab.binding.hue.tests/itest.bndrun b/itests/org.openhab.binding.hue.tests/itest.bndrun
index e7d647639..230f7bcda 100644
--- a/itests/org.openhab.binding.hue.tests/itest.bndrun
+++ b/itests/org.openhab.binding.hue.tests/itest.bndrun
@@ -15,9 +15,6 @@ Fragment-Host: org.openhab.binding.hue
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	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)',\
@@ -25,22 +22,9 @@ Fragment-Host: org.openhab.binding.hue
 	org.apache.xbean.finder;version='[4.12.0,4.12.1)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.jupnp;version='[2.5.2,2.5.3)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery.upnp;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
@@ -63,5 +47,24 @@ Fragment-Host: org.openhab.binding.hue
 	org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.hue;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.hue.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.openhab.binding.hue;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.hue.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery.upnp;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.net;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/AbstractHueOSGiTestParent.java b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/AbstractHueOSGiTestParent.java
index f52701fcc..c2ae4bec0 100644
--- a/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/AbstractHueOSGiTestParent.java
+++ b/itests/org.openhab.binding.hue.tests/src/main/java/org/openhab/binding/hue/internal/AbstractHueOSGiTestParent.java
@@ -14,9 +14,9 @@ package org.openhab.binding.hue.internal;
 
 import static org.junit.jupiter.api.Assertions.*;
 
+import org.openhab.core.test.java.JavaOSGiTest;
 import org.openhab.core.thing.Thing;
 import org.openhab.core.thing.binding.ThingHandler;
-import org.openhab.core.test.java.JavaOSGiTest;
 
 /**
  * @author Markus Rathgeb - migrated to plain Java test
diff --git a/itests/org.openhab.binding.max.tests/itest.bndrun b/itests/org.openhab.binding.max.tests/itest.bndrun
index e5496521e..699aa1bc8 100644
--- a/itests/org.openhab.binding.max.tests/itest.bndrun
+++ b/itests/org.openhab.binding.max.tests/itest.bndrun
@@ -16,27 +16,14 @@ Fragment-Host: org.openhab.binding.max
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
-	org.apache.commons.net;version='[3.3.0,3.3.1)',\
 	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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
@@ -49,5 +36,22 @@ Fragment-Host: org.openhab.binding.max
 	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-	org.openhab.binding.max;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.max.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.openhab.binding.max;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.max.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.modbus.tests/itest.bndrun b/itests/org.openhab.binding.modbus.tests/itest.bndrun
index b2d7267b3..363e688ef 100644
--- a/itests/org.openhab.binding.modbus.tests/itest.bndrun
+++ b/itests/org.openhab.binding.modbus.tests/itest.bndrun
@@ -33,14 +33,7 @@ Fragment-Host: org.openhab.binding.modbus
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	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.config.core;version='[2.5.0,2.5.1)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
@@ -49,11 +42,6 @@ Fragment-Host: org.openhab.binding.modbus
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
-	com.neuronrobotics.nrjavaserial;version='[3.15.0,3.15.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
@@ -61,14 +49,32 @@ Fragment-Host: org.openhab.binding.modbus
 	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.modbus;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.modbus.tests;version='[2.5.9,2.5.10)',\
-	org.openhab.io.transport.modbus;version='[2.5.9,2.5.10)',\
-	org.apache.commons.commons-pool2;version='[2.8.1,2.8.2)'
+	org.apache.commons.commons-pool2;version='[2.8.1,2.8.2)',\
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	nrjavaserial;version='[5.2.1,5.2.2)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.modbus;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.modbus.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.transform;version='[3.0.0,3.0.1)',\
+	org.openhab.io.transport.modbus;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
index 43c3c4d2d..1c457a3b0 100644
--- a/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
+++ b/itests/org.openhab.binding.modbus.tests/src/main/java/org/openhab/binding/modbus/tests/AbstractModbusOSGiTest.java
@@ -19,6 +19,7 @@ import static org.hamcrest.core.IsInstanceOf.instanceOf;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
+import static org.mockito.MockitoAnnotations.openMocks;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -35,12 +36,8 @@ import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
 import org.openhab.binding.modbus.internal.ModbusHandlerFactory;
 import org.openhab.core.events.Event;
 import org.openhab.core.events.EventFilter;
@@ -71,8 +68,6 @@ import org.slf4j.LoggerFactory;
 /**
  * @author Sami Salonen - Initial contribution
  */
-@ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.WARN)
 @NonNullByDefault
 public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
 
@@ -106,6 +101,8 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
 
     private final Logger logger = LoggerFactory.getLogger(AbstractModbusOSGiTest.class);
 
+    private @NonNullByDefault({}) AutoCloseable mocksCloseable;
+
     protected @Mock @NonNullByDefault({}) ModbusManager mockedModbusManager;
     protected @NonNullByDefault({}) ManagedThingProvider thingProvider;
     protected @NonNullByDefault({}) ManagedItemProvider itemProvider;
@@ -131,6 +128,7 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
     @BeforeEach
     public void setUpAbstractModbusOSGiTest() {
         logger.debug("setUpAbstractModbusOSGiTest BEGIN");
+        mocksCloseable = openMocks(this);
         registerVolatileStorageService();
         registerService(mockedModbusManager);
         registerService(stateSubscriber);
@@ -156,7 +154,7 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
     }
 
     @AfterEach
-    public void tearDownAbstractModbusOSGiTest() {
+    public void tearDownAbstractModbusOSGiTest() throws Exception {
         logger.debug("tearDownAbstractModbusOSGiTest BEGIN");
         swapModbusManagerToReal();
         for (Item item : addedItems) {
@@ -169,6 +167,7 @@ public abstract class AbstractModbusOSGiTest extends JavaOSGiTest {
             logger.debug("Unlinking {} <-> {}", link.getItemName(), link.getLinkedUID());
             assertNotNull(itemChannelLinkProvider.remove(link.getUID()));
         }
+        mocksCloseable.close();
         logger.debug("tearDownAbstractModbusOSGiTest END");
     }
 
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
index efa326473..af1aa5888 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/itest.bndrun
@@ -16,8 +16,6 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
@@ -27,32 +25,8 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
 	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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	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.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.paho.client.mqttv3;version='[1.2.1,1.2.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.binding.mqtt;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.generic;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.homeassistant;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.homeassistant.tests;version='[2.5.2,2.5.3)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.transport.mqtt;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.transform;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	io.netty.buffer;version='[4.1.42,4.1.43)',\
@@ -62,13 +36,53 @@ Fragment-Host: org.openhab.binding.mqtt.homeassistant
 	io.netty.handler;version='[4.1.42,4.1.43)',\
 	io.netty.resolver;version='[4.1.42,4.1.43)',\
 	io.netty.transport;version='[4.1.42,4.1.43)',\
-	org.openhab.io.mqttembeddedbroker;version='[2.5.0,2.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	com.google.dagger;version='[2.20.0,2.20.1)',\
+	com.hivemq.client.mqtt;version='[1.1.2,1.1.3)',\
+	io.netty.codec-http;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-epoll;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-unix-common;version='[4.1.34,4.1.35)',\
+	io.reactivex.rxjava2.rxjava;version='[2.2.5,2.2.6)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
+	org.apache.commons.codec;version='[1.10.0,1.10.1)',\
+	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
+	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.jctools.core;version='[2.1.2,2.1.3)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.mqtt;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.generic;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.homeassistant;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.homeassistant.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.transport.mqtt;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.transform;version='[3.0.0,3.0.1)',\
+	org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)'
 
 -runvm: -Dio.netty.noUnsafe=true
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
index 54778eb4e..bed3295b2 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/DiscoverComponentsTest.java b/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/DiscoverComponentsTest.java
index 5780d8e75..8d8001ebb 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/DiscoverComponentsTest.java
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/DiscoverComponentsTest.java
@@ -96,6 +96,5 @@ public class DiscoverComponentsTest extends JavaOSGiTest {
         discoveryIds.addAll(HaID.fromConfig(config));
 
         discover.startDiscovery(connection, 50, discoveryIds, discovered).get(100, TimeUnit.MILLISECONDS);
-
     }
 }
diff --git a/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/EmbeddedBrokerTools.java b/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/EmbeddedBrokerTools.java
index 647b3a31c..c35cb7641 100644
--- a/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/EmbeddedBrokerTools.java
+++ b/itests/org.openhab.binding.mqtt.homeassistant.tests/src/main/java/org/openhab/binding/mqtt/EmbeddedBrokerTools.java
@@ -60,7 +60,6 @@ public class EmbeddedBrokerTools {
                 @Override
                 public void brokerRemoved(@NonNull String brokerID, @NonNull MqttBrokerConnection broker) {
                 }
-
             };
             mqttService.addBrokersListener(observer);
             assertTrue(semaphore.tryAcquire(1000, TimeUnit.MILLISECONDS), "Wait for embedded connection client failed");
@@ -85,5 +84,4 @@ public class EmbeddedBrokerTools {
                 + " failed. State: " + embeddedConnection.connectionState());
         return embeddedConnection;
     }
-
 }
diff --git a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
index 818f8bf72..585bafa84 100644
--- a/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
+++ b/itests/org.openhab.binding.mqtt.homie.tests/itest.bndrun
@@ -16,8 +16,6 @@ Fragment-Host: org.openhab.binding.mqtt.homie
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
@@ -26,34 +24,10 @@ Fragment-Host: org.openhab.binding.mqtt.homie
 	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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	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.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.paho.client.mqttv3;version='[1.2.1,1.2.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.binding.mqtt;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.generic;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.homie;version='[2.5.2,2.5.3)',\
-	org.openhab.binding.mqtt.homie.tests;version='[2.5.2,2.5.3)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.transport.mqtt;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;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.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	com.h2database.mvstore;version='[1.4.199,1.4.200)',\
 	io.netty.buffer;version='[4.1.42,4.1.43)',\
 	io.netty.codec;version='[4.1.42,4.1.43)',\
@@ -62,12 +36,52 @@ Fragment-Host: org.openhab.binding.mqtt.homie
 	io.netty.handler;version='[4.1.42,4.1.43)',\
 	io.netty.resolver;version='[4.1.42,4.1.43)',\
 	io.netty.transport;version='[4.1.42,4.1.43)',\
-	org.openhab.io.mqttembeddedbroker;version='[2.5.0,2.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	com.google.dagger;version='[2.20.0,2.20.1)',\
+	com.hivemq.client.mqtt;version='[1.1.2,1.1.3)',\
+	io.netty.codec-http;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-epoll;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-unix-common;version='[4.1.34,4.1.35)',\
+	io.reactivex.rxjava2.rxjava;version='[2.2.5,2.2.6)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.apache.aries.javax.jax.rs-api;version='[1.0.0,1.0.1)',\
+	org.apache.commons.codec;version='[1.10.0,1.10.1)',\
+	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
+	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.jctools.core;version='[2.1.2,2.1.3)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.mqtt;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.generic;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.homie;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.mqtt.homie.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.transport.mqtt;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.transform;version='[3.0.0,3.0.1)',\
+	org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)'
 -runvm: -Dio.netty.noUnsafe=true
diff --git a/itests/org.openhab.binding.ntp.tests/itest.bndrun b/itests/org.openhab.binding.ntp.tests/itest.bndrun
index d3c948b6f..673235aed 100644
--- a/itests/org.openhab.binding.ntp.tests/itest.bndrun
+++ b/itests/org.openhab.binding.ntp.tests/itest.bndrun
@@ -16,7 +16,6 @@ Fragment-Host: org.openhab.binding.ntp
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.commons.net;version='[3.3.0,3.3.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
@@ -24,34 +23,40 @@ Fragment-Host: org.openhab.binding.ntp
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
 	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-	org.openhab.binding.ntp;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.ntp.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.ntp;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.ntp.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
index f872e3d6a..a65a969e3 100644
--- a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -15,24 +15,12 @@ Fragment-Host: org.openhab.binding.systeminfo
 -runbundles: \
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	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.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
@@ -46,14 +34,31 @@ Fragment-Host: org.openhab.binding.systeminfo
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
 	com.sun.jna;version='[5.5.0,5.5.1)',\
 	com.sun.jna.platform;version='[5.5.0,5.5.1)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
 	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
-	org.openhab.binding.systeminfo;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.systeminfo.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.systeminfo;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.systeminfo.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.tradfri.tests/itest.bndrun b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
index e92e4a0e9..1af32d5a5 100644
--- a/itests/org.openhab.binding.tradfri.tests/itest.bndrun
+++ b/itests/org.openhab.binding.tradfri.tests/itest.bndrun
@@ -13,17 +13,10 @@ Fragment-Host: org.openhab.binding.tradfri
 #
 -runbundles: \
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
@@ -31,23 +24,12 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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.openhab.core.config.discovery.mdns;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.transport.mdns;version='[2.5.0,2.5.1)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
 	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
 	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
@@ -58,5 +40,27 @@ Fragment-Host: org.openhab.binding.tradfri
 	org.eclipse.californium.element-connector;version='[2.0.0,2.0.1)',\
 	org.eclipse.californium.scandium;version='[2.0.0,2.0.1)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.tradfri;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.tradfri.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.tradfri;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.tradfri.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery.mdns;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.transport.mdns;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.wemo.tests/itest.bndrun b/itests/org.openhab.binding.wemo.tests/itest.bndrun
index 84df3da1b..b1776653b 100644
--- a/itests/org.openhab.binding.wemo.tests/itest.bndrun
+++ b/itests/org.openhab.binding.wemo.tests/itest.bndrun
@@ -15,8 +15,6 @@ Fragment-Host: org.openhab.binding.wemo
 	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
 	com.google.gson;version='[2.8.2,2.8.3)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.exec;version='[1.1.0,1.1.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
 	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
 	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
@@ -26,32 +24,15 @@ Fragment-Host: org.openhab.binding.wemo
 	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
 	org.jupnp;version='[2.5.2,2.5.3)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.discovery.upnp;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.net;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.transport.upnp;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
-	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
-	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
 	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.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)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	org.apache.servicemix.bundles.jaxb-impl;version='[2.2.11,2.2.12)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)',\
 	org.objectweb.asm;version='[7.1.0,7.1.1)',\
 	org.objectweb.asm.commons;version='[7.1.0,7.1.1)',\
 	org.objectweb.asm.tree;version='[7.1.0,7.1.1)',\
@@ -68,5 +49,28 @@ Fragment-Host: org.openhab.binding.wemo
 	org.eclipse.jetty.xml;version='[9.4.20,9.4.21)',\
 	org.ops4j.pax.web.pax-web-api;version='[7.2.11,7.2.12)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	org.openhab.binding.wemo;version='[2.5.9,2.5.10)',\
-	org.openhab.binding.wemo.tests;version='[2.5.9,2.5.10)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.binding.wemo;version='[3.0.0,3.0.1)',\
+	org.openhab.binding.wemo.tests;version='[3.0.0,3.0.1)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.binding.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.discovery.upnp;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.xml;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.console;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.net;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.transport.upnp;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing;version='[3.0.0,3.0.1)',\
+	org.openhab.core.thing.xml;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)'
diff --git a/itests/org.openhab.binding.wemo.tests/src/main/java/org/openhab/binding/wemo/internal/discovery/test/WemoLinkDiscoveryServiceOSGiTest.java b/itests/org.openhab.binding.wemo.tests/src/main/java/org/openhab/binding/wemo/internal/discovery/test/WemoLinkDiscoveryServiceOSGiTest.java
index ee35247dc..ad0a9a509 100644
--- a/itests/org.openhab.binding.wemo.tests/src/main/java/org/openhab/binding/wemo/internal/discovery/test/WemoLinkDiscoveryServiceOSGiTest.java
+++ b/itests/org.openhab.binding.wemo.tests/src/main/java/org/openhab/binding/wemo/internal/discovery/test/WemoLinkDiscoveryServiceOSGiTest.java
@@ -21,8 +21,6 @@ import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.util.List;
 
-import org.openhab.core.config.core.Configuration;
-import org.openhab.core.thing.Bridge;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.jupnp.model.ValidationException;
@@ -34,6 +32,8 @@ import org.openhab.binding.wemo.internal.handler.WemoBridgeHandler;
 import org.openhab.binding.wemo.internal.http.WemoHttpCall;
 import org.openhab.binding.wemo.internal.test.GenericWemoLightOSGiTestParent;
 import org.openhab.binding.wemo.internal.test.GenericWemoOSGiTest;
+import org.openhab.core.config.core.Configuration;
+import org.openhab.core.thing.Bridge;
 
 /**
  * Tests for {@link WemoLinkDiscoveryService}.
diff --git a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
index 174a7de3c..878544542 100644
--- a/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
+++ b/itests/org.openhab.io.mqttembeddedbroker.tests/itest.bndrun
@@ -25,34 +25,47 @@ Fragment-Host: org.openhab.io.mqttembeddedbroker
 	io.netty.resolver;version='[4.1.42,4.1.43)',\
 	io.netty.transport;version='[4.1.42,4.1.43)',\
 	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
-	org.apache.commons.io;version='[2.2.0,2.2.1)',\
-	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
 	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.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
-	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.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.paho.client.mqttv3;version='[1.2.1,1.2.2)',\
 	org.objenesis;version='[2.6.0,2.6.1)',\
-	org.openhab.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
-	org.openhab.core.io.transport.mqtt;version='[2.5.0,2.5.1)',\
-	org.openhab.core.test;version='[2.5.0,2.5.1)',\
-	org.openhab.io.mqttembeddedbroker;version='[2.5.2,2.5.3)',\
-	org.openhab.io.mqttembeddedbroker.tests;version='[2.5.2,2.5.3)',\
 	org.osgi.service.event;version='[1.4.0,1.4.1)',\
-	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
-	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
 	slf4j.api;version='[1.7.25,1.7.26)',\
 	tec.uom.lib.uom-lib-common;version='[1.0.3,1.0.4)',\
 	tec.uom.se;version='[1.0.10,1.0.11)',\
 	ch.qos.logback.classic;version='[1.2.3,1.2.4)',\
-	net.bytebuddy.byte-buddy;version='[1.9.10,1.9.11)',\
-	net.bytebuddy.byte-buddy-agent;version='[1.9.10,1.9.11)',\
-	org.mockito.mockito-core;version='[3.1.0,3.1.1)'
+	biz.aQute.tester.junit-platform;version='[5.1.2,5.1.3)',\
+	com.google.dagger;version='[2.20.0,2.20.1)',\
+	com.hivemq.client.mqtt;version='[1.1.2,1.1.3)',\
+	io.netty.codec-http;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-epoll;version='[4.1.34,4.1.35)',\
+	io.netty.transport-native-unix-common;version='[4.1.34,4.1.35)',\
+	io.reactivex.rxjava2.rxjava;version='[2.2.5,2.2.6)',\
+	junit-jupiter-api;version='[5.6.2,5.6.3)',\
+	junit-jupiter-engine;version='[5.6.2,5.6.3)',\
+	junit-platform-commons;version='[1.6.2,1.6.3)',\
+	junit-platform-engine;version='[1.6.2,1.6.3)',\
+	junit-platform-launcher;version='[1.6.2,1.6.3)',\
+	net.bytebuddy.byte-buddy;version='[1.10.13,1.10.14)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.10.13,1.10.14)',\
+	org.apache.commons.codec;version='[1.10.0,1.10.1)',\
+	org.eclipse.jetty.http;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.io;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.security;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.server;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.servlet;version='[9.4.20,9.4.21)',\
+	org.eclipse.jetty.util;version='[9.4.20,9.4.21)',\
+	org.glassfish.hk2.external.javax.inject;version='[2.4.0,2.4.1)',\
+	org.hamcrest;version='[2.2.0,2.2.1)',\
+	org.jctools.core;version='[2.1.2,2.1.3)',\
+	org.mockito.mockito-core;version='[3.4.6,3.4.7)',\
+	org.openhab.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.config.core;version='[3.0.0,3.0.1)',\
+	org.openhab.core.io.transport.mqtt;version='[3.0.0,3.0.1)',\
+	org.openhab.core.test;version='[3.0.0,3.0.1)',\
+	org.openhab.io.mqttembeddedbroker;version='[3.0.0,3.0.1)',\
+	org.openhab.io.mqttembeddedbroker.tests;version='[3.0.0,3.0.1)',\
+	org.opentest4j;version='[1.2.0,1.2.1)',\
+	org.reactivestreams.reactive-streams;version='[1.0.2,1.0.3)'
 -runvm: -Dio.netty.noUnsafe=true
diff --git a/itests/org.openhab.io.mqttembeddedbroker.tests/pom.xml b/itests/org.openhab.io.mqttembeddedbroker.tests/pom.xml
index 1de271b09..ac22da343 100644
--- a/itests/org.openhab.io.mqttembeddedbroker.tests/pom.xml
+++ b/itests/org.openhab.io.mqttembeddedbroker.tests/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/itests/org.openhab.io.mqttembeddedbroker.tests/src/main/java/org/openhab/io/mqttembeddedbroker/EmbeddedBrokerTools.java b/itests/org.openhab.io.mqttembeddedbroker.tests/src/main/java/org/openhab/io/mqttembeddedbroker/EmbeddedBrokerTools.java
index baf16cc20..736e91c80 100644
--- a/itests/org.openhab.io.mqttembeddedbroker.tests/src/main/java/org/openhab/io/mqttembeddedbroker/EmbeddedBrokerTools.java
+++ b/itests/org.openhab.io.mqttembeddedbroker.tests/src/main/java/org/openhab/io/mqttembeddedbroker/EmbeddedBrokerTools.java
@@ -62,7 +62,6 @@ public class EmbeddedBrokerTools {
                 @Override
                 public void brokerRemoved(@NonNull String brokerID, @NonNull MqttBrokerConnection broker) {
                 }
-
             };
             mqttService.addBrokersListener(observer);
             assertTrue(semaphore.tryAcquire(700, TimeUnit.MILLISECONDS), "Wait for embedded connection client failed");
@@ -88,5 +87,4 @@ public class EmbeddedBrokerTools {
                 + " failed. State: " + embeddedConnection.connectionState());
         return embeddedConnection;
     }
-
 }
diff --git a/itests/pom.xml b/itests/pom.xml
index 178087cc0..2d628dfc6 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -17,7 +17,14 @@
   <name>openHAB Add-ons :: Integration Tests</name>
 
   <modules>
+    <module>org.openhab.binding.astro.tests</module>
+    <module>org.openhab.binding.hue.tests</module>
+    <module>org.openhab.binding.max.tests</module>
+    <module>org.openhab.binding.modbus.tests</module>
     <module>org.openhab.binding.nest.tests</module>
+    <module>org.openhab.binding.systeminfo.tests</module>
+    <module>org.openhab.binding.tradfri.tests</module>
+    <module>org.openhab.binding.wemo.tests</module>
     <module>org.openhab.persistence.mapdb.tests</module>
   </modules>