diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 99be53f0dc..77ad497e09 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -138,6 +138,12 @@
       <version>${jetty.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-servlet</artifactId>
+      <version>${jetty.version}</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-client</artifactId>
@@ -218,8 +224,8 @@
     </dependency>
 
     <!-- Serial Communication -->
-    <!-- <dependency> <groupId>org.eclipse.kura</groupId> <artifactId>org.eclipse.soda.dk.comm</artifactId> <version>1.2.201</version> 
-      <scope>compile</scope> </dependency> -->
+    <!-- <dependency> <groupId>org.eclipse.kura</groupId> <artifactId>org.eclipse.soda.dk.comm</artifactId> <version>1.2.201</version>
+    <scope>compile</scope> </dependency> -->
     <dependency>
       <groupId>org.vesalainen.comm</groupId>
       <artifactId>javaxcomm</artifactId>
diff --git a/bom/test-index/pom.xml b/bom/test-index/pom.xml
index 9622e3fc63..1a0feb771c 100644
--- a/bom/test-index/pom.xml
+++ b/bom/test-index/pom.xml
@@ -15,12 +15,23 @@
   <name>openHAB Core :: BOM :: Test Index</name>
 
   <dependencies>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi.enroute.junit.wrapper</artifactId>
+      <version>4.12.0</version>
+    </dependency>
     <dependency>
       <groupId>org.openhab.core.bom</groupId>
       <artifactId>org.openhab.core.bom.test</artifactId>
       <type>pom</type>
       <scope>compile</scope>
       <optional>true</optional>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index f107384b0a..6a70e633c3 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -21,9 +21,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>osgi.enroute.junit.wrapper</artifactId>
-      <version>4.12.0</version>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
@@ -46,14 +46,6 @@
       <artifactId>groovy</artifactId>
       <version>2.5.5</version>
     </dependency>
-
-    <!-- Jetty -->
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>${jetty.version}</version>
-      <scope>compile</scope>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java b/bundles/org.openhab.core.storage.mapdb/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.mapdb.tests/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java
rename to bundles/org.openhab.core.storage.mapdb/src/test/java/org/eclipse/smarthome/storage/mapdb/internal/MapDbStorageServiceTest.java
diff --git a/bundles/org.openhab.core.test/org.eclipse.smarthome.test.launch b/bundles/org.openhab.core.test/org.eclipse.smarthome.test.launch
deleted file mode 100644
index acfa30fa8d..0000000000
--- a/bundles/org.openhab.core.test/org.eclipse.smarthome.test.launch
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="true"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.smarthome.test"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.smarthome.test"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.smarthome.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.equinox.p2.director.app.product"/>
-<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.eclipsesource.jaxrs.jersey-min@default:default,com.google.gson@default:default,com.google.guava@default:default,javax.activation@default:default,javax.inject@default:default,javax.measure.unit-api@default:default,javax.servlet@default:default,javax.transaction@default:false,javax.xml@default:default,net.bytebuddy.byte-buddy-agent@default:default,net.bytebuddy.byte-buddy@default:default,org.apache.ant@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging@default:default,org.apache.commons.net@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.codehaus.groovy@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:false,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jdt.annotation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.osgi.alpn.fragment@default:false,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.hamcrest.integration@default:default,org.hamcrest.library@default:default,org.hamcrest.text@default:default,org.hamcrest@default:default,org.junit@default:default,org.mockito.mockito-core@default:default,org.objenesis@default:default,org.slf4j.api@default:default,org.slf4j.log4j@default:default,tec.uom.lib.uom-lib-common@default:default,tec.uom.se@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.smarthome.config.core@default:default,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core@default:default,org.eclipse.smarthome.test@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 82bde1ffda..c51b62ce04 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -97,25 +97,14 @@
     <module>org.openhab.core.model.thing.runtime</module>
     <module>org.openhab.core.storage.json</module>
     <module>org.openhab.core.storage.mapdb</module>
-    <module>org.openhab.core.test.magic</module>
     <module>org.openhab.core.test</module>
+    <module>org.openhab.core.test.magic</module>
     <module>org.openhab.core.ui</module>
     <module>org.openhab.core.ui.icon</module>
     <module>org.openhab.core.ui.dashboard</module>
   </modules>
 
   <profiles>
-    <profile>
-      <id>skip-test-bundles</id>
-      <activation>
-        <property>
-          <name>!skipTests</name>
-        </property>
-      </activation>
-      <modules>
-        <module>tests</module>
-      </modules>
-    </profile>
     <profile>
       <id>model-specific-profile</id>
       <activation>
@@ -265,9 +254,9 @@
       <type>pom</type>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <groupId>org.openhab.core.bom</groupId>
+      <artifactId>org.openhab.core.bom.test</artifactId>
+      <type>pom</type>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/.classpath b/bundles/tests/org.openhab.core.storage.mapdb.tests/.classpath
deleted file mode 100644
index 5e8a55fefb..0000000000
--- a/bundles/tests/org.openhab.core.storage.mapdb.tests/.classpath
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
-		<attributes>
-			<attribute name="optional" value="true"/>
-			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/.project b/bundles/tests/org.openhab.core.storage.mapdb.tests/.project
deleted file mode 100644
index 800a222610..0000000000
--- a/bundles/tests/org.openhab.core.storage.mapdb.tests/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.openhab.core.storage.mapdb.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/.settings/org.eclipse.core.resources.prefs b/bundles/tests/org.openhab.core.storage.mapdb.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 8dd9b1df3d..0000000000
--- a/bundles/tests/org.openhab.core.storage.mapdb.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/test/java=UTF-8
-encoding/<project>=UTF-8
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/pom.xml b/bundles/tests/org.openhab.core.storage.mapdb.tests/pom.xml
deleted file mode 100644
index 5afea00e52..0000000000
--- a/bundles/tests/org.openhab.core.storage.mapdb.tests/pom.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.openhab.core.storage.mapdb.tests</artifactId>
-
-  <name>openHAB Core :: Bundles :: Tests :: Storage MapDB Tests</name>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.openhab.core.bom</groupId>
-      <artifactId>org.openhab.core.bom.test</artifactId>
-      <type>pom</type>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.openhab.core.bundles</groupId>
-      <artifactId>org.openhab.core.storage.mapdb</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/bundles/tests/org.openhab.core.tests/.settings/org.eclipse.m2e.core.prefs b/bundles/tests/org.openhab.core.tests/.settings/org.eclipse.m2e.core.prefs
deleted file mode 100644
index f897a7f1cb..0000000000
--- a/bundles/tests/org.openhab.core.tests/.settings/org.eclipse.m2e.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1
diff --git a/bundles/tests/org.openhab.core.voice.tests/NOTICE b/bundles/tests/org.openhab.core.voice.tests/NOTICE
deleted file mode 100644
index b8675cd02e..0000000000
--- a/bundles/tests/org.openhab.core.voice.tests/NOTICE
+++ /dev/null
@@ -1,19 +0,0 @@
-This content is produced and maintained by the Eclipse SmartHome project.
-
-* Project home: https://eclipse.org/smarthome/
-
-== Declared Project Licenses
-
-This program and the accompanying materials are made available under the terms
-of the Eclipse Public License 2.0 which is available at
-https://www.eclipse.org/legal/epl-2.0/.
-
-== Source Code
-
-https://github.com/eclipse/smarthome
-
-== Copyright Holders
-
-See the NOTICE file distributed with the source code at
-https://github.com/eclipse/smarthome/blob/master/NOTICE
-for detailed information regarding copyright ownership.
diff --git a/bundles/tests/org.openhab.core.audio.tests/NOTICE b/itests/org.openhab.core.audio.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/NOTICE
rename to itests/org.openhab.core.audio.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.audio.tests/configuration/sounds/mp3AudioFile.mp3 b/itests/org.openhab.core.audio.tests/configuration/sounds/mp3AudioFile.mp3
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/configuration/sounds/mp3AudioFile.mp3
rename to itests/org.openhab.core.audio.tests/configuration/sounds/mp3AudioFile.mp3
diff --git a/bundles/tests/org.openhab.core.audio.tests/configuration/sounds/wavAudioFile.wav b/itests/org.openhab.core.audio.tests/configuration/sounds/wavAudioFile.wav
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/configuration/sounds/wavAudioFile.wav
rename to itests/org.openhab.core.audio.tests/configuration/sounds/wavAudioFile.wav
diff --git a/bundles/tests/org.openhab.core.audio.tests/org.eclipse.smarthome.core.audio.test.launch b/itests/org.openhab.core.audio.tests/org.eclipse.smarthome.core.audio.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/org.eclipse.smarthome.core.audio.test.launch
rename to itests/org.openhab.core.audio.tests/org.eclipse.smarthome.core.audio.test.launch
diff --git a/bundles/tests/org.openhab.core.audio.tests/pom.xml b/itests/org.openhab.core.audio.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.audio.tests/pom.xml
rename to itests/org.openhab.core.audio.tests/pom.xml
index a6bdea8efb..58babed04e 100644
--- a/bundles/tests/org.openhab.core.audio.tests/pom.xml
+++ b/itests/org.openhab.core.audio.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.audio.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Audio Test</name>
+  <name>openHAB Core :: Integration Tests :: Audio Test</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServeltTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServeltTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServeltTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AbstractAudioServeltTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioConsoleTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioFormatTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerServletTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioManagerTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/AudioServletTest.java
diff --git a/bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java b/itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java
similarity index 100%
rename from bundles/tests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java
rename to itests/org.openhab.core.audio.tests/src/test/java/org/eclipse/smarthome/core/audio/internal/fake/AudioSinkFake.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/NOTICE b/itests/org.openhab.core.auth.oauth2client.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/NOTICE
rename to itests/org.openhab.core.auth.oauth2client.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/README.md b/itests/org.openhab.core.auth.oauth2client.tests/README.md
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/README.md
rename to itests/org.openhab.core.auth.oauth2client.tests/README.md
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/pom.xml b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml
similarity index 71%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/pom.xml
rename to itests/org.openhab.core.auth.oauth2client.tests/pom.xml
index dcafe7b929..8c955db81f 100644
--- a/bundles/tests/org.openhab.core.auth.oauth2client.tests/pom.xml
+++ b/itests/org.openhab.core.auth.oauth2client.tests/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.auth.oauth2client.tests</artifactId>
 
-  <name>openHAB Core :: Bundles :: Tests :: OAuth2Client Tests</name>
+  <name>openHAB Core :: Integration Tests :: OAuth2Client Tests</name>
   <packaging>eclipse-test-plugin</packaging>
 
 
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AbstractTestAgent.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/AuthorizationCodeTestAgent.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/ResourceOwnerTestAgent.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/TestAgent.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java b/itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/main/java/org/eclipse/smarthome/auth/oauth2client/test/internal/console/ConsoleOAuthCommandExtension.java
diff --git a/bundles/tests/org.openhab.core.auth.oauth2client.tests/src/test/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java b/itests/org.openhab.core.auth.oauth2client.tests/src/test/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.auth.oauth2client.tests/src/test/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java
rename to itests/org.openhab.core.auth.oauth2client.tests/src/test/java/org/eclipse/smarthome/auth/oauth2client/test/internal/cipher/CipherTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/NOTICE b/itests/org.openhab.core.automation.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/NOTICE
rename to itests/org.openhab.core.automation.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/org.eclipse.smarthome.automation.core.test.launch b/itests/org.openhab.core.automation.core.tests/org.eclipse.smarthome.automation.core.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/org.eclipse.smarthome.automation.core.test.launch
rename to itests/org.openhab.core.automation.core.tests/org.eclipse.smarthome.automation.core.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/pom.xml b/itests/org.openhab.core.automation.core.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.automation.core.tests/pom.xml
rename to itests/org.openhab.core.automation.core.tests/pom.xml
index 6146290ad2..15b143c8e6 100644
--- a/bundles/tests/org.openhab.core.automation.core.tests/pom.xml
+++ b/itests/org.openhab.core.automation.core.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Core Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Core Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ConnectionValidatorTest.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ConnectionValidatorTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ConnectionValidatorTest.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ConnectionValidatorTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ReferenceResolverUtilTest.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ReferenceResolverUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ReferenceResolverUtilTest.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/ReferenceResolverUtilTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleEngineTest.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleEngineTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleEngineTest.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleEngineTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RulePrefixTest.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RulePrefixTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RulePrefixTest.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RulePrefixTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryTest.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryTest.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/RuleRegistryTest.java
diff --git a/bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/TestModuleTypeProvider.java b/itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/TestModuleTypeProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/TestModuleTypeProvider.java
rename to itests/org.openhab.core.automation.core.tests/src/test/java/org/eclipse/smarthome/automation/core/internal/TestModuleTypeProvider.java
diff --git a/bundles/tests/org.openhab.core.automation.event.tests/.gitignore b/itests/org.openhab.core.automation.event.tests/.gitignore
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.event.tests/.gitignore
rename to itests/org.openhab.core.automation.event.tests/.gitignore
diff --git a/bundles/tests/org.openhab.core.automation.event.tests/NOTICE b/itests/org.openhab.core.automation.event.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.event.tests/NOTICE
rename to itests/org.openhab.core.automation.event.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.event.tests/org.eclipse.smarthome.automation.event.test.launch b/itests/org.openhab.core.automation.event.tests/org.eclipse.smarthome.automation.event.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.event.tests/org.eclipse.smarthome.automation.event.test.launch
rename to itests/org.openhab.core.automation.event.tests/org.eclipse.smarthome.automation.event.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.event.tests/pom.xml b/itests/org.openhab.core.automation.event.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.automation.event.tests/pom.xml
rename to itests/org.openhab.core.automation.event.tests/pom.xml
index e20571bce4..ab6ae4028f 100644
--- a/bundles/tests/org.openhab.core.automation.event.tests/pom.xml
+++ b/itests/org.openhab.core.automation.event.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.event.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Event Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Event Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.event.tests/src/test/java/org/eclipse/smarthome/automation/event/RuleEventTest.java b/itests/org.openhab.core.automation.event.tests/src/test/java/org/eclipse/smarthome/automation/event/RuleEventTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.event.tests/src/test/java/org/eclipse/smarthome/automation/event/RuleEventTest.java
rename to itests/org.openhab.core.automation.event.tests/src/test/java/org/eclipse/smarthome/automation/event/RuleEventTest.java
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/.gitignore b/itests/org.openhab.core.automation.integration.tests/.gitignore
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/.gitignore
rename to itests/org.openhab.core.automation.integration.tests/.gitignore
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/NOTICE b/itests/org.openhab.core.automation.integration.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/NOTICE
rename to itests/org.openhab.core.automation.integration.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/org.eclipse.smarthome.automation.integration.test.launch b/itests/org.openhab.core.automation.integration.tests/org.eclipse.smarthome.automation.integration.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/org.eclipse.smarthome.automation.integration.test.launch
rename to itests/org.openhab.core.automation.integration.tests/org.eclipse.smarthome.automation.integration.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/pom.xml b/itests/org.openhab.core.automation.integration.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.automation.integration.tests/pom.xml
rename to itests/org.openhab.core.automation.integration.tests/pom.xml
index 495468504f..bb8c4f7495 100644
--- a/bundles/tests/org.openhab.core.automation.integration.tests/pom.xml
+++ b/itests/org.openhab.core.automation.integration.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.integration.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Integration Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Integration Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomActionsTypeDefinition.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/moduletypes/CustomTriggersTypeDefinition.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/rules/ItemRuleDefinition.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/SimpleTestTemplate.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateRuleWithReferences.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json b/itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json
rename to itests/org.openhab.core.automation.integration.tests/src/main/resources/ESH-INF/automation/templates/TestTemplateWithCompositeModules.json
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationJsonTest.java b/itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationJsonTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationJsonTest.java
rename to itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationJsonTest.java
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationTest.java b/itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationTest.java
rename to itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/AutomationIntegrationTest.java
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/HostFragmentSupportTest.java b/itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/HostFragmentSupportTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/HostFragmentSupportTest.java
rename to itests/org.openhab.core.automation.integration.tests/src/test/java/org/eclipse/smarthome/automation/integration/test/HostFragmentSupportTest.java
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb1.jar b/itests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb1.jar
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb1.jar
rename to itests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb1.jar
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb2.jar b/itests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb2.jar
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb2.jar
rename to itests/org.openhab.core.automation.integration.tests/src/test/resources/fragment-tb2.jar
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb1.jar b/itests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb1.jar
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb1.jar
rename to itests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb1.jar
diff --git a/bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb2.jar b/itests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb2.jar
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb2.jar
rename to itests/org.openhab.core.automation.integration.tests/src/test/resources/host-tb2.jar
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/.gitignore b/itests/org.openhab.core.automation.module.core.tests/.gitignore
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/.gitignore
rename to itests/org.openhab.core.automation.module.core.tests/.gitignore
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/NOTICE b/itests/org.openhab.core.automation.module.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/NOTICE
rename to itests/org.openhab.core.automation.module.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/org.eclipse.smarthome.automation.module.core.test.launch b/itests/org.openhab.core.automation.module.core.tests/org.eclipse.smarthome.automation.module.core.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/org.eclipse.smarthome.automation.module.core.test.launch
rename to itests/org.openhab.core.automation.module.core.tests/org.eclipse.smarthome.automation.module.core.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/pom.xml b/itests/org.openhab.core.automation.module.core.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/pom.xml
rename to itests/org.openhab.core.automation.module.core.tests/pom.xml
index ebeff0df2e..0ff51da90d 100644
--- a/bundles/tests/org.openhab.core.automation.module.core.tests/pom.xml
+++ b/itests/org.openhab.core.automation.module.core.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.module.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Core Module Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Core Module Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RunRuleModuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RunRuleModuleTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RunRuleModuleTest.java
rename to itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RunRuleModuleTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RuntimeRuleTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RuntimeRuleTest.java
rename to itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/RuntimeRuleTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/provider/AnnotationActionModuleTypeProviderTest.java b/itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/provider/AnnotationActionModuleTypeProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/provider/AnnotationActionModuleTypeProviderTest.java
rename to itests/org.openhab.core.automation.module.core.tests/src/test/java/org/eclipse/smarthome/automation/module/core/internal/provider/AnnotationActionModuleTypeProviderTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/NOTICE b/itests/org.openhab.core.automation.module.script.defaultscope.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/NOTICE
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/org.eclipse.smarthome.automation.module.script.defaultscope.test.launch b/itests/org.openhab.core.automation.module.script.defaultscope.tests/org.eclipse.smarthome.automation.module.script.defaultscope.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/org.eclipse.smarthome.automation.module.script.defaultscope.test.launch
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/org.eclipse.smarthome.automation.module.script.defaultscope.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml b/itests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
similarity index 97%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
index 64cc62c936..5b3189df78 100644
--- a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
+++ b/itests/org.openhab.core.automation.module.script.defaultscope.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.module.script.defaultscope.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Script Module Defaultscope Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Script Module Defaultscope Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeFailure.js b/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeFailure.js
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeFailure.js
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeFailure.js
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeWorking.js b/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeWorking.js
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeWorking.js
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/src/main/resources/ESH-INF/automation/jsr223/scopeWorking.js
diff --git a/bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/test/java/org/eclipse/smarthome/automation/module/script/defaultscope/internal/ScopeTest.java b/itests/org.openhab.core.automation.module.script.defaultscope.tests/src/test/java/org/eclipse/smarthome/automation/module/script/defaultscope/internal/ScopeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.defaultscope.tests/src/test/java/org/eclipse/smarthome/automation/module/script/defaultscope/internal/ScopeTest.java
rename to itests/org.openhab.core.automation.module.script.defaultscope.tests/src/test/java/org/eclipse/smarthome/automation/module/script/defaultscope/internal/ScopeTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.script.tests/NOTICE b/itests/org.openhab.core.automation.module.script.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.tests/NOTICE
rename to itests/org.openhab.core.automation.module.script.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.module.script.tests/org.eclipse.smarthome.automation.module.script.test.launch b/itests/org.openhab.core.automation.module.script.tests/org.eclipse.smarthome.automation.module.script.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.tests/org.eclipse.smarthome.automation.module.script.test.launch
rename to itests/org.openhab.core.automation.module.script.tests/org.eclipse.smarthome.automation.module.script.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.module.script.tests/pom.xml b/itests/org.openhab.core.automation.module.script.tests/pom.xml
similarity index 97%
rename from bundles/tests/org.openhab.core.automation.module.script.tests/pom.xml
rename to itests/org.openhab.core.automation.module.script.tests/pom.xml
index 901260189d..91c8ebb5a2 100644
--- a/bundles/tests/org.openhab.core.automation.module.script.tests/pom.xml
+++ b/itests/org.openhab.core.automation.module.script.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.module.script.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Script Module Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Script Module Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.module.script.tests/src/main/resources/ESH-INF/automation/rules/DemoScriptRule.json b/itests/org.openhab.core.automation.module.script.tests/src/main/resources/ESH-INF/automation/rules/DemoScriptRule.json
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.tests/src/main/resources/ESH-INF/automation/rules/DemoScriptRule.json
rename to itests/org.openhab.core.automation.module.script.tests/src/main/resources/ESH-INF/automation/rules/DemoScriptRule.json
diff --git a/bundles/tests/org.openhab.core.automation.module.script.tests/src/test/java/org/eclipse/smarthome/automation/module/script/ScriptRuleTest.java b/itests/org.openhab.core.automation.module.script.tests/src/test/java/org/eclipse/smarthome/automation/module/script/ScriptRuleTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.script.tests/src/test/java/org/eclipse/smarthome/automation/module/script/ScriptRuleTest.java
rename to itests/org.openhab.core.automation.module.script.tests/src/test/java/org/eclipse/smarthome/automation/module/script/ScriptRuleTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/.gitignore b/itests/org.openhab.core.automation.module.timer.tests/.gitignore
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/.gitignore
rename to itests/org.openhab.core.automation.module.timer.tests/.gitignore
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/NOTICE b/itests/org.openhab.core.automation.module.timer.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/NOTICE
rename to itests/org.openhab.core.automation.module.timer.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/org.eclipse.smarthome.automation.module.timer.test.launch b/itests/org.openhab.core.automation.module.timer.tests/org.eclipse.smarthome.automation.module.timer.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/org.eclipse.smarthome.automation.module.timer.test.launch
rename to itests/org.openhab.core.automation.module.timer.tests/org.eclipse.smarthome.automation.module.timer.test.launch
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/pom.xml b/itests/org.openhab.core.automation.module.timer.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/pom.xml
rename to itests/org.openhab.core.automation.module.timer.tests/pom.xml
index e1d86372f0..62cf18388b 100644
--- a/bundles/tests/org.openhab.core.automation.module.timer.tests/pom.xml
+++ b/itests/org.openhab.core.automation.module.timer.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.automation.module.timer.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Automation Module Timer Tests</name>
+  <name>openHAB Core :: Integration Tests :: Automation Module Timer Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/BasicConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/BasicConditionHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/BasicConditionHandlerTest.java
rename to itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/BasicConditionHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
rename to itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/DayOfWeekConditionHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/RuntimeRuleTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/RuntimeRuleTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/RuntimeRuleTest.java
rename to itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/RuntimeRuleTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
rename to itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayConditionHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java b/itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
rename to itests/org.openhab.core.automation.module.timer.tests/src/test/java/org/eclipse/smarthome/automation/module/timer/internal/TimeOfDayTriggerHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/NOTICE b/itests/org.openhab.core.binding.xml.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/NOTICE
rename to itests/org.openhab.core.binding.xml.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/org.eclipse.smarthome.core.binding.xml.test.launch b/itests/org.openhab.core.binding.xml.tests/org.eclipse.smarthome.core.binding.xml.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/org.eclipse.smarthome.core.binding.xml.test.launch
rename to itests/org.openhab.core.binding.xml.tests/org.eclipse.smarthome.core.binding.xml.test.launch
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/pom.xml b/itests/org.openhab.core.binding.xml.tests/pom.xml
similarity index 92%
rename from bundles/tests/org.openhab.core.binding.xml.tests/pom.xml
rename to itests/org.openhab.core.binding.xml.tests/pom.xml
index d01a3cec74..ec695ae219 100644
--- a/bundles/tests/org.openhab.core.binding.xml.tests/pom.xml
+++ b/itests/org.openhab.core.binding.xml.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.binding.xml.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Binding XML Tests</name>
+  <name>openHAB Core :: Integration Tests :: Binding XML Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java b/itests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java
rename to itests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoI18nTest.java
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java b/itests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java
rename to itests/org.openhab.core.binding.xml.tests/src/test/java/org/eclipse/smarthome/core/binding/xml/test/BindingInfoTest.java
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/BundleInfoTestNoAuthor.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
diff --git a/bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_nl.properties b/itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_nl.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_nl.properties
rename to itests/org.openhab.core.binding.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_nl.properties
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/.classpath b/itests/org.openhab.core.compat1x.tests/.classpath
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/.classpath
rename to itests/org.openhab.core.compat1x.tests/.classpath
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/.project b/itests/org.openhab.core.compat1x.tests/.project
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/.project
rename to itests/org.openhab.core.compat1x.tests/.project
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/.settings/org.eclipse.core.resources.prefs b/itests/org.openhab.core.compat1x.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/.settings/org.eclipse.core.resources.prefs
rename to itests/org.openhab.core.compat1x.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/.settings/org.eclipse.m2e.core.prefs b/itests/org.openhab.core.compat1x.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/.settings/org.eclipse.m2e.core.prefs
rename to itests/org.openhab.core.compat1x.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/NOTICE b/itests/org.openhab.core.compat1x.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/NOTICE
rename to itests/org.openhab.core.compat1x.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/integration-test.bndrun b/itests/org.openhab.core.compat1x.tests/integration-test.bndrun
similarity index 96%
rename from bundles/tests/org.openhab.core.compat1x.tests/integration-test.bndrun
rename to itests/org.openhab.core.compat1x.tests/integration-test.bndrun
index 3cb477148a..bffc26639c 100644
--- a/bundles/tests/org.openhab.core.compat1x.tests/integration-test.bndrun
+++ b/itests/org.openhab.core.compat1x.tests/integration-test.bndrun
@@ -1,6 +1,6 @@
 -standalone: \
-    ../../../bom/runtime-index/target/index.xml;name="runtime",\
-    ../../../bom/test-index/target/index.xml;name="test",\
+    ../../bom/runtime-index/target/index.xml;name="runtime",\
+    ../../bom/test-index/target/index.xml;name="test",\
     target/index.xml;name="self"
 
 -resolve.effective: active
@@ -107,4 +107,4 @@ Provide-Capability: osgi.service;objectClass:List<String>="org.eclipse.smarthome
 	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)'
\ No newline at end of file
+	org.openhab.core.voice;version='[2.5.0,2.5.1)'
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/pom.xml b/itests/org.openhab.core.compat1x.tests/pom.xml
similarity index 94%
rename from bundles/tests/org.openhab.core.compat1x.tests/pom.xml
rename to itests/org.openhab.core.compat1x.tests/pom.xml
index 0d3c96a738..27e353bc11 100644
--- a/bundles/tests/org.openhab.core.compat1x.tests/pom.xml
+++ b/itests/org.openhab.core.compat1x.tests/pom.xml
@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.compat1x.tests</artifactId>
 
-  <name>openHAB Core :: Bundles :: Tests :: 1.x Compatibility Layer Tests</name>
+  <name>openHAB Core :: Integration Tests :: 1.x Compatibility Layer Tests</name>
 
   <dependencies>
     <dependency>
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/ItemMapperTest.java b/itests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/ItemMapperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/ItemMapperTest.java
rename to itests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/ItemMapperTest.java
diff --git a/bundles/tests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/TypeMapperTest.java b/itests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/TypeMapperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/TypeMapperTest.java
rename to itests/org.openhab.core.compat1x.tests/src/main/java/org/openhab/core/compat1x/internal/TypeMapperTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/NOTICE b/itests/org.openhab.core.config.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/NOTICE
rename to itests/org.openhab.core.config.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch b/itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
rename to itests/org.openhab.core.config.core.tests/org.eclipse.smarthome.config.core.test.launch
diff --git a/bundles/tests/org.openhab.core.config.core.tests/pom.xml b/itests/org.openhab.core.config.core.tests/pom.xml
similarity index 88%
rename from bundles/tests/org.openhab.core.config.core.tests/pom.xml
rename to itests/org.openhab.core.config.core.tests/pom.xml
index 6fd3523ca0..7b7507dc17 100644
--- a/bundles/tests/org.openhab.core.config.core.tests/pom.xml
+++ b/itests/org.openhab.core.config.core.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration Core Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration Core Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionParameterBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigDescriptionRegistryOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigOptionRegistryOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigUtilTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/ConfigurationTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/i18n/I18nConfigOptionsProviderTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/metadata/MetadataConfigDescriptionProviderImplTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/normalization/NormalizerTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigDescriptionValidatorTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/internal/validation/ConfigValidationExceptionTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusInfoTest.java
diff --git a/bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java b/itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
rename to itests/org.openhab.core.config.core.tests/src/test/java/org/eclipse/smarthome/config/core/status/ConfigStatusServiceTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.mdns.tests/NOTICE b/itests/org.openhab.core.config.discovery.mdns.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.mdns.tests/NOTICE
rename to itests/org.openhab.core.config.discovery.mdns.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.discovery.mdns.tests/org.eclipse.smarthome.config.discovery.mdns.test.launch b/itests/org.openhab.core.config.discovery.mdns.tests/org.eclipse.smarthome.config.discovery.mdns.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.mdns.tests/org.eclipse.smarthome.config.discovery.mdns.test.launch
rename to itests/org.openhab.core.config.discovery.mdns.tests/org.eclipse.smarthome.config.discovery.mdns.test.launch
diff --git a/bundles/tests/org.openhab.core.config.discovery.mdns.tests/pom.xml b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.config.discovery.mdns.tests/pom.xml
rename to itests/org.openhab.core.config.discovery.mdns.tests/pom.xml
index 67b3e2feb9..3a15c6c60d 100644
--- a/bundles/tests/org.openhab.core.config.discovery.mdns.tests/pom.xml
+++ b/itests/org.openhab.core.config.discovery.mdns.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.discovery.mdns.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration mDNS Discovery Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration mDNS Discovery Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.discovery.mdns.tests/src/test/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java b/itests/org.openhab.core.config.discovery.mdns.tests/src/test/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.mdns.tests/src/test/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
rename to itests/org.openhab.core.config.discovery.mdns.tests/src/test/java/org/eclipse/smarthome/config/discovery/mdns/internal/MDNSDiscoveryServiceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/NOTICE b/itests/org.openhab.core.config.discovery.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/NOTICE
rename to itests/org.openhab.core.config.discovery.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/org.eclipse.smarthome.config.discovery.test.launch b/itests/org.openhab.core.config.discovery.tests/org.eclipse.smarthome.config.discovery.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/org.eclipse.smarthome.config.discovery.test.launch
rename to itests/org.openhab.core.config.discovery.tests/org.eclipse.smarthome.config.discovery.test.launch
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/pom.xml b/itests/org.openhab.core.config.discovery.tests/pom.xml
similarity index 94%
rename from bundles/tests/org.openhab.core.config.discovery.tests/pom.xml
rename to itests/org.openhab.core.config.discovery.tests/pom.xml
index 86e0446837..1075502a68 100644
--- a/bundles/tests/org.openhab.core.config.discovery.tests/pom.xml
+++ b/itests/org.openhab.core.config.discovery.tests/pom.xml
@@ -2,15 +2,15 @@
 <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>
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.discovery.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration Discovery Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration Discovery Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/DiscoveryServiceRegistryOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGITest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGITest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGITest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/DynamicThingUpdateOSGITest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/InboxPredicatesTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/inbox/events/InboxEventFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/AutomaticInboxProcessorTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGITest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGITest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGITest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/InboxOSGITest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/discovery/internal/PersistentInboxTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryResultImplTest.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryResultImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryResultImplTest.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryResultImplTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMock.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMock.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMock.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMock.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMockOfBridge.java b/itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMockOfBridge.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMockOfBridge.java
rename to itests/org.openhab.core.config.discovery.tests/src/test/java/org/eclipse/smarthome/config/setup/test/discovery/DiscoveryServiceMockOfBridge.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/NOTICE b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/NOTICE
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.test.launch b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.test.launch
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/org.eclipse.smarthome.config.discovery.usbserial.linuxsysfs.test.launch
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
similarity index 92%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
index 5991a229b6..01c09bdd18 100644
--- a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
+++ b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/pom.xml
@@ -2,15 +2,15 @@
 <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>
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.discovery.usbserial.linuxsysfs.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration USB-Serial Discovery for Linux using sysfs scanning Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration USB-Serial Discovery for Linux using sysfs scanning Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/DeltaUsbSerialScannerTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/PollingUsbSerialScannerTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java b/itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.linuxsysfs.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/linuxsysfs/internal/SysFsUsbSerialScannerTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/NOTICE b/itests/org.openhab.core.config.discovery.usbserial.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.tests/NOTICE
rename to itests/org.openhab.core.config.discovery.usbserial.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/org.eclipse.smarthome.config.discovery.usbserial.test.launch b/itests/org.openhab.core.config.discovery.usbserial.tests/org.eclipse.smarthome.config.discovery.usbserial.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.tests/org.eclipse.smarthome.config.discovery.usbserial.test.launch
rename to itests/org.openhab.core.config.discovery.usbserial.tests/org.eclipse.smarthome.config.discovery.usbserial.test.launch
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/pom.xml b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
similarity index 94%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
rename to itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
index 2cb03e2264..2734db6a43 100644
--- a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
+++ b/itests/org.openhab.core.config.discovery.usbserial.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.discovery.usbserial.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration Discovery UsbSerial Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration Discovery UsbSerial Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
rename to itests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/internal/UsbSerialDiscoveryServiceTest.java
diff --git a/bundles/tests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java b/itests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
rename to itests/org.openhab.core.config.discovery.usbserial.tests/src/test/java/org/eclipse/smarthome/config/discovery/usbserial/testutil/UsbSerialDeviceInformationGenerator.java
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/NOTICE b/itests/org.openhab.core.config.dispatch.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/NOTICE
rename to itests/org.openhab.core.config.dispatch.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments.default.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments.default.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments.default.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments.default.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments_services/comments.service.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments_services/comments.service.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments_services/comments.service.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/comments_conf/comments_services/comments.service.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default.and.service.global.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default.and.service.global.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default.and.service.global.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default.and.service.global.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default_vs_services_files_services/default.and.service.global.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default_vs_services_files_services/default.and.service.global.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default_vs_services_files_services/default.and.service.global.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/default_vs_services_files_conf/default_vs_services_files_services/default.and.service.global.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/deleted_file_services/deleted.file.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/deleted_file_services/deleted.file.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/deleted_file_services/deleted.file.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/deleted_file_conf/deleted_file_services/deleted.file.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_configuration_removed_after_file_delete/exclusive_pid_configuration_removed_after_file_delete_services/service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_configuration_removed_after_file_delete/exclusive_pid_configuration_removed_after_file_delete_services/service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_configuration_removed_after_file_delete/exclusive_pid_configuration_removed_after_file_delete_services/service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_configuration_removed_after_file_delete/exclusive_pid_configuration_removed_after_file_delete_services/service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_file_removed_during_runtime/exclusive_pid_file_removed_during_runtime_services/service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_file_removed_during_runtime/exclusive_pid_file_removed_during_runtime_services/service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_file_removed_during_runtime/exclusive_pid_file_removed_during_runtime_services/service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_file_removed_during_runtime/exclusive_pid_file_removed_during_runtime_services/service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_overrides_configuration_on_update/exclusive_pid_overrides_configuration_on_update_services/service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_overrides_configuration_on_update/exclusive_pid_overrides_configuration_on_update_services/service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_overrides_configuration_on_update/exclusive_pid_overrides_configuration_on_update_services/service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/exclusive_pid_overrides_configuration_on_update/exclusive_pid_overrides_configuration_on_update_services/service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global.and.local.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global.and.local.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global.and.local.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global.and.local.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/global.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/global.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/global.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/global.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/local.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/local.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/local.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_no_conflict_services/local.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/a.overriding.local.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/a.overriding.local.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/a.overriding.local.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/a.overriding.local.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/b.overriden.global.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/b.overriden.global.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/b.overriden.global.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_global_services/b.overriden.global.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/a.overriding.global.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/a.overriding.global.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/a.overriding.global.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/a.overriding.global.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/b.overriden.local.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/b.overriden.local.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/b.overriden.local.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_and_local_pid_different_files_conf/global_and_local_pid_overridden_local_services/b.overriden.local.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.first.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.first.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.first.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.first.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.second.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.second.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.second.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_conf/global_pid_services/global.pid.service.second.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.last.modified.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.last.modified.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.last.modified.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.last.modified.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.a.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.a.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.a.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.a.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.b.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.b.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.b.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.b.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.c.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.c.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.c.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_conflict_conf/global_pid_different_files_conflict_services/global.pid.service.c.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.a.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.a.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.a.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.a.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.b.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.b.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.b.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.b.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.c.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.c.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.c.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_different_files_no_merge_conf/global_pid_different_files_no_merge_services/global.pid.service.c.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_empty_conf/global_pid_empty_services/global.pid.empty.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_empty_conf/global_pid_empty_services/global.pid.empty.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_empty_conf/global_pid_empty_services/global.pid.empty.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_empty_conf/global_pid_empty_services/global.pid.empty.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global.pid.no.pair.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global.pid.no.pair.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global.pid.no.pair.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global.pid.no.pair.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global_pid_no_pair_services/global.pid.no.pair.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global_pid_no_pair_services/global.pid.no.pair.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global_pid_no_pair_services/global.pid.no.pair.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_no_pair_conf/global_pid_no_pair_services/global.pid.no.pair.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_with_local_pid_line_error/global_pid_with_local_pid_line_services_error/service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_with_local_pid_line_error/global_pid_with_local_pid_line_services_error/service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/global_pid_with_local_pid_line_error/global_pid_with_local_pid_line_services_error/service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/global_pid_with_local_pid_line_error/global_pid_with_local_pid_line_services_error/service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored.global.default.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored.global.default.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored.global.default.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored.global.default.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored_global_pid_services/ignored.global.service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored_global_pid_services/ignored.global.service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored_global_pid_services/ignored.global.service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/ignored_global_pid_conf/ignored_global_pid_services/ignored.global.service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/first.global.default.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/first.global.default.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/first.global.default.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/first.global.default.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/last_pid_services/first.global.service.pid.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/last_pid_services/first.global.service.pid.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/last_pid_services/first.global.service.pid.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/last_pid_conf/last_pid_services/first.global.service.pid.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.first.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.first.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.first.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.first.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.second.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.second.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.second.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conf/local_pid_services/local.pid.service.second.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local.pid.conflict.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local.pid.conflict.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local.pid.conflict.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local.pid.conflict.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local_pid_conflict_services/local.pid.conflict.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local_pid_conflict_services/local.pid.conflict.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local_pid_conflict_services/local.pid.conflict.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_conflict_conf/local_pid_conflict_services/local.pid.conflict.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/last.modified.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/last.modified.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/last.modified.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/last.modified.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.a.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.a.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.a.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.a.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.b.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.b.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.b.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.b.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.c.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.c.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.c.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_conflict_conf/local_pid_different_files_conflict_services/local.pid.service.c.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.a.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.a.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.a.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.a.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.b.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.b.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.b.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.b.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.c.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.c.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.c.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_different_files_no_conflict_conf/local_pid_different_files_no_conflict_services/local.pid.service.c.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local.pid.empty.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local.pid.empty.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local.pid.empty.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local.pid.empty.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local_pid_empty_services/local.pid.empty.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local_pid_empty_services/local.pid.empty.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local_pid_empty_services/local.pid.empty.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_empty_conf/local_pid_empty_services/local.pid.empty.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local.pid.no.dot.default.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local.pid.no.dot.default.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local.pid.no.dot.default.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local.pid.no.dot.default.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local_pid_no_dot_services/local.pid.no.dot.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local_pid_no_dot_services/local.pid.no.dot.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local_pid_no_dot_services/local.pid.no.dot.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_dot_conf/local_pid_no_dot_services/local.pid.no.dot.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local.pid.no.property.default.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local.pid.no.property.default.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local.pid.no.property.default.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local.pid.no.property.default.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local_pid_no_property_services/local.pid.no.property.service.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local_pid_no_property_services/local.pid.no.property.service.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local_pid_no_property_services/local.pid.no.property.service.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_property_conf/local_pid_no_property_services/local.pid.no.property.service.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local.pid.no.value.default.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local.pid.no.value.default.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local.pid.no.value.default.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local.pid.no.value.default.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local_pid_no_value_services/local.pid.no.value.service.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local_pid_no_value_services/local.pid.no.value.service.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local_pid_no_value_services/local.pid.no.value.service.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/local_pid_no_value_conf/local_pid_no_value_services/local.pid.no.value.service.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx1.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx1.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx1.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx1.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx2.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx2.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx2.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts/multiple_contexts/service-ctx2.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/duplicate/service-ctx1duplicate.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/duplicate/service-ctx1duplicate.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/duplicate/service-ctx1duplicate.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/duplicate/service-ctx1duplicate.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx1.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx1.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx1.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx1.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx2.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx2.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx2.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/multiple_service_contexts_duplicates/multiple_contexts/service-ctx2.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no.pid.default.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no.pid.default.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no.pid.default.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no.pid.default.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no_pid_services/no.pid.service.file.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no_pid_services/no.pid.service.file.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no_pid_services/no.pid.service.file.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_conf/no_pid_services/no.pid.service.file.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/default.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/default.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/default.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/default.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/no_pid_no_dot_services/service.cfg b/itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/no_pid_no_dot_services/service.cfg
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/no_pid_no_dot_services/service.cfg
rename to itests/org.openhab.core.config.dispatch.tests/configurations/no_pid_no_dot_conf/no_pid_no_dot_services/service.cfg
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt.default.txt b/itests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt.default.txt
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt.default.txt
rename to itests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt.default.txt
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt_services/txt.service.txt b/itests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt_services/txt.service.txt
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt_services/txt.service.txt
rename to itests/org.openhab.core.config.dispatch.tests/configurations/txt_conf/txt_services/txt.service.txt
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/org.eclipse.smarthome.config.dispatch.test.launch b/itests/org.openhab.core.config.dispatch.tests/org.eclipse.smarthome.config.dispatch.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/org.eclipse.smarthome.config.dispatch.test.launch
rename to itests/org.openhab.core.config.dispatch.tests/org.eclipse.smarthome.config.dispatch.test.launch
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/pom.xml b/itests/org.openhab.core.config.dispatch.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/pom.xml
rename to itests/org.openhab.core.config.dispatch.tests/pom.xml
index 5f3dda8acb..37c77eba6b 100644
--- a/bundles/tests/org.openhab.core.config.dispatch.tests/pom.xml
+++ b/itests/org.openhab.core.config.dispatch.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.dispatch.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Configuration Dispatcher Tests</name>
+  <name>openHAB Core :: Integration Tests :: Configuration Dispatcher Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherFileWatcherTest.java b/itests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherFileWatcherTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherFileWatcherTest.java
rename to itests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherFileWatcherTest.java
diff --git a/bundles/tests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherOSGiTest.java b/itests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherOSGiTest.java
rename to itests/org.openhab.core.config.dispatch.tests/src/test/java/org/eclipse/smarthome/config/dispatch/test/ConfigDispatcherOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/NOTICE b/itests/org.openhab.core.config.xml.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/NOTICE
rename to itests/org.openhab.core.config.xml.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/org.eclipse.smarthome.config.xml.test.launch b/itests/org.openhab.core.config.xml.tests/org.eclipse.smarthome.config.xml.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/org.eclipse.smarthome.config.xml.test.launch
rename to itests/org.openhab.core.config.xml.tests/org.eclipse.smarthome.config.xml.test.launch
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/pom.xml b/itests/org.openhab.core.config.xml.tests/pom.xml
similarity index 93%
rename from bundles/tests/org.openhab.core.config.xml.tests/pom.xml
rename to itests/org.openhab.core.config.xml.tests/pom.xml
index 0d5ec1a5b0..e981097e3f 100644
--- a/bundles/tests/org.openhab.core.config.xml.tests/pom.xml
+++ b/itests/org.openhab.core.config.xml.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.config.xml.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Config XML Tests</name>
+  <name>openHAB Core :: Integration Tests :: Config XML Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java b/itests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java
rename to itests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionI18nTest.java
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java
rename to itests/org.openhab.core.config.xml.tests/src/test/java/org/eclipse/smarthome/config/xml/test/ConfigDescriptionsTest.java
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.fragment/src/main/resources/ESH-INF/config/config.xml
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/config/.keep
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsFragmentTest.host/src/main/resources/ESH-INF/thing/MyThingType.xml
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/config/config.xml
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test.properties
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/i18n/test_de.properties
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/config/config.xml
diff --git a/bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties b/itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
rename to itests/org.openhab.core.config.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
diff --git a/bundles/tests/org.openhab.core.id.tests/NOTICE b/itests/org.openhab.core.id.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.id.tests/NOTICE
rename to itests/org.openhab.core.id.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.id.tests/org.eclipse.smarthome.core.id.test.launch b/itests/org.openhab.core.id.tests/org.eclipse.smarthome.core.id.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.id.tests/org.eclipse.smarthome.core.id.test.launch
rename to itests/org.openhab.core.id.tests/org.eclipse.smarthome.core.id.test.launch
diff --git a/bundles/tests/org.openhab.core.id.tests/pom.xml b/itests/org.openhab.core.id.tests/pom.xml
similarity index 86%
rename from bundles/tests/org.openhab.core.id.tests/pom.xml
rename to itests/org.openhab.core.id.tests/pom.xml
index ccb62474bc..253414d4b6 100644
--- a/bundles/tests/org.openhab.core.id.tests/pom.xml
+++ b/itests/org.openhab.core.id.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.id.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: ID Tests</name>
+  <name>openHAB Core :: Integration Tests :: ID Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.id.tests/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java b/itests/org.openhab.core.id.tests/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.id.tests/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java
rename to itests/org.openhab.core.id.tests/src/test/java/org/eclipse/smarthome/core/id/UUIDTest.java
diff --git a/bundles/tests/org.openhab.core.io.http.tests/NOTICE b/itests/org.openhab.core.io.http.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.http.tests/NOTICE
rename to itests/org.openhab.core.io.http.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.http.tests/org.eclipse.smarthome.io.http.test.launch b/itests/org.openhab.core.io.http.tests/org.eclipse.smarthome.io.http.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.http.tests/org.eclipse.smarthome.io.http.test.launch
rename to itests/org.openhab.core.io.http.tests/org.eclipse.smarthome.io.http.test.launch
diff --git a/bundles/tests/org.openhab.core.io.http.tests/pom.xml b/itests/org.openhab.core.io.http.tests/pom.xml
similarity index 81%
rename from bundles/tests/org.openhab.core.io.http.tests/pom.xml
rename to itests/org.openhab.core.io.http.tests/pom.xml
index 4528367f41..ce089fb0e9 100644
--- a/bundles/tests/org.openhab.core.io.http.tests/pom.xml
+++ b/itests/org.openhab.core.io.http.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.http.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Network I/O HTTP Tests</name>
+  <name>openHAB Core :: Integration Tests :: Network I/O HTTP Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.http.tests/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java b/itests/org.openhab.core.io.http.tests/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.http.tests/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java
rename to itests/org.openhab.core.io.http.tests/src/test/java/org/eclipse/smarthome/io/http/internal/HttpContextFactoryServiceImplTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/NOTICE b/itests/org.openhab.core.io.net.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/NOTICE
rename to itests/org.openhab.core.io.net.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.net.tests/org.eclipse.smarthome.io.net.test.launch b/itests/org.openhab.core.io.net.tests/org.eclipse.smarthome.io.net.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/org.eclipse.smarthome.io.net.test.launch
rename to itests/org.openhab.core.io.net.tests/org.eclipse.smarthome.io.net.test.launch
diff --git a/bundles/tests/org.openhab.core.io.net.tests/pom.xml b/itests/org.openhab.core.io.net.tests/pom.xml
similarity index 82%
rename from bundles/tests/org.openhab.core.io.net.tests/pom.xml
rename to itests/org.openhab.core.io.net.tests/pom.xml
index d89c76678c..534a41b500 100644
--- a/bundles/tests/org.openhab.core.io.net.tests/pom.xml
+++ b/itests/org.openhab.core.io.net.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.net.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Network I/O Tests</name>
+  <name>openHAB Core :: Integration Tests :: Network I/O Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java b/itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java
rename to itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/BaseHttpUtilTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java b/itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java
rename to itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpRequestBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java b/itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java
rename to itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/HttpUtilTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java b/itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java
rename to itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/ExtensibleTrustManagerImplTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryTest.java b/itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryTest.java
rename to itests/org.openhab.core.io.net.tests/src/test/java/org/eclipse/smarthome/io/net/http/internal/WebClientFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.io.net.tests/src/test/resources/google_weather_response.xml b/itests/org.openhab.core.io.net.tests/src/test/resources/google_weather_response.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.io.net.tests/src/test/resources/google_weather_response.xml
rename to itests/org.openhab.core.io.net.tests/src/test/resources/google_weather_response.xml
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/NOTICE b/itests/org.openhab.core.io.rest.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/NOTICE
rename to itests/org.openhab.core.io.rest.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/org.eclipse.smarthome.io.rest.core.test.launch b/itests/org.openhab.core.io.rest.core.tests/org.eclipse.smarthome.io.rest.core.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/org.eclipse.smarthome.io.rest.core.test.launch
rename to itests/org.openhab.core.io.rest.core.tests/org.eclipse.smarthome.io.rest.core.test.launch
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/pom.xml b/itests/org.openhab.core.io.rest.core.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/pom.xml
rename to itests/org.openhab.core.io.rest.core.tests/pom.xml
index 75f49e2304..3a76c42489 100644
--- a/bundles/tests/org.openhab.core.io.rest.core.tests/pom.xml
+++ b/itests/org.openhab.core.io.rest.core.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.rest.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: IO REST Core Tests</name>
+  <name>openHAB Core :: Integration Tests :: IO REST Core Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/channel/ChannelTypeResourceTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/discovery/InboxResourceOSGITest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperWithTransformOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/EnrichedItemDTOMapperWithTransformOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/ItemResourceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/item/MetadataSelectorMatcherTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/persistence/PersistenceResourceTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/internal/profile/ProfileTypeResourceTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/service/test/ConfigurableServiceResourceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java b/itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java
rename to itests/org.openhab.core.io.rest.core.tests/src/test/java/org/eclipse/smarthome/io/rest/core/thing/EnrichedThingDTOMapperTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.sitemap.tests/NOTICE b/itests/org.openhab.core.io.rest.sitemap.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sitemap.tests/NOTICE
rename to itests/org.openhab.core.io.rest.sitemap.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.rest.sitemap.tests/org.eclipse.smarthome.io.rest.sitemap.test.launch b/itests/org.openhab.core.io.rest.sitemap.tests/org.eclipse.smarthome.io.rest.sitemap.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sitemap.tests/org.eclipse.smarthome.io.rest.sitemap.test.launch
rename to itests/org.openhab.core.io.rest.sitemap.tests/org.eclipse.smarthome.io.rest.sitemap.test.launch
diff --git a/bundles/tests/org.openhab.core.io.rest.sitemap.tests/pom.xml b/itests/org.openhab.core.io.rest.sitemap.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.io.rest.sitemap.tests/pom.xml
rename to itests/org.openhab.core.io.rest.sitemap.tests/pom.xml
index 6fab6af0c7..c5ce65b1cf 100644
--- a/bundles/tests/org.openhab.core.io.rest.sitemap.tests/pom.xml
+++ b/itests/org.openhab.core.io.rest.sitemap.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.rest.sitemap.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Sitemap REST Interface Tests</name>
+  <name>openHAB Core :: Integration Tests :: Sitemap REST Interface Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.rest.sitemap.tests/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java b/itests/org.openhab.core.io.rest.sitemap.tests/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sitemap.tests/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
rename to itests/org.openhab.core.io.rest.sitemap.tests/src/test/java/org/eclipse/smarthome/io/rest/sitemap/internal/SitemapResourceTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.sse.tests/NOTICE b/itests/org.openhab.core.io.rest.sse.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sse.tests/NOTICE
rename to itests/org.openhab.core.io.rest.sse.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.rest.sse.tests/org.eclipse.smarthome.io.rest.sse.test.launch b/itests/org.openhab.core.io.rest.sse.tests/org.eclipse.smarthome.io.rest.sse.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sse.tests/org.eclipse.smarthome.io.rest.sse.test.launch
rename to itests/org.openhab.core.io.rest.sse.tests/org.eclipse.smarthome.io.rest.sse.test.launch
diff --git a/bundles/tests/org.openhab.core.io.rest.sse.tests/pom.xml b/itests/org.openhab.core.io.rest.sse.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.io.rest.sse.tests/pom.xml
rename to itests/org.openhab.core.io.rest.sse.tests/pom.xml
index 8fcee4a850..9a407c8794 100644
--- a/bundles/tests/org.openhab.core.io.rest.sse.tests/pom.xml
+++ b/itests/org.openhab.core.io.rest.sse.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.rest.sse.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: IO SSE Tests</name>
+  <name>openHAB Core :: Integration Tests :: IO SSE Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.rest.sse.tests/src/test/java/org/eclipse/smarthome/io/rest/sse/test/SseResourceOSGiTest.java b/itests/org.openhab.core.io.rest.sse.tests/src/test/java/org/eclipse/smarthome/io/rest/sse/test/SseResourceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.sse.tests/src/test/java/org/eclipse/smarthome/io/rest/sse/test/SseResourceOSGiTest.java
rename to itests/org.openhab.core.io.rest.sse.tests/src/test/java/org/eclipse/smarthome/io/rest/sse/test/SseResourceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/NOTICE b/itests/org.openhab.core.io.rest.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/NOTICE
rename to itests/org.openhab.core.io.rest.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/org.eclipse.smarthome.io.rest.test.launch b/itests/org.openhab.core.io.rest.tests/org.eclipse.smarthome.io.rest.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/org.eclipse.smarthome.io.rest.test.launch
rename to itests/org.openhab.core.io.rest.tests/org.eclipse.smarthome.io.rest.test.launch
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/pom.xml b/itests/org.openhab.core.io.rest.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.io.rest.tests/pom.xml
rename to itests/org.openhab.core.io.rest.tests/pom.xml
index 6026860e52..5735e2933c 100644
--- a/bundles/tests/org.openhab.core.io.rest.tests/pom.xml
+++ b/itests/org.openhab.core.io.rest.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.rest.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: IO REST Tests</name>
+  <name>openHAB Core :: Integration Tests :: IO REST Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java b/itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java
rename to itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/JSONResponseTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java b/itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java
rename to itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/Stream2JSONInputStreamTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java b/itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java
rename to itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/CorsFilterTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java b/itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java
rename to itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/ProxyFilterTest.java
diff --git a/bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java b/itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java
rename to itests/org.openhab.core.io.rest.tests/src/test/java/org/eclipse/smarthome/io/rest/internal/filter/SatisfiableResourceFilterTest.java
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/NOTICE b/itests/org.openhab.core.io.transport.mqtt.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/NOTICE
rename to itests/org.openhab.core.io.transport.mqtt.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/org.eclipse.smarthome.io.transport.mqtt.test.launch b/itests/org.openhab.core.io.transport.mqtt.tests/org.eclipse.smarthome.io.transport.mqtt.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/org.eclipse.smarthome.io.transport.mqtt.test.launch
rename to itests/org.openhab.core.io.transport.mqtt.tests/org.eclipse.smarthome.io.transport.mqtt.test.launch
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/pom.xml b/itests/org.openhab.core.io.transport.mqtt.tests/pom.xml
similarity index 81%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/pom.xml
rename to itests/org.openhab.core.io.transport.mqtt.tests/pom.xml
index 267ab5734c..eb870ddacd 100644
--- a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/pom.xml
+++ b/itests/org.openhab.core.io.transport.mqtt.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.transport.mqtt.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Mqtt Transport I/O Tests</name>
+  <name>openHAB Core :: Integration Tests :: Mqtt Transport I/O Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttAsyncClientEx.java b/itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttAsyncClientEx.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttAsyncClientEx.java
rename to itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttAsyncClientEx.java
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java b/itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java
rename to itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionEx.java
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java b/itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java
rename to itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/MqttBrokerConnectionTests.java
diff --git a/bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java b/itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java
rename to itests/org.openhab.core.io.transport.mqtt.tests/src/test/java/org/eclipse/smarthome/io/transport/mqtt/internal/MqttServiceTests.java
diff --git a/bundles/tests/org.openhab.core.io.transport.upnp.tests/NOTICE b/itests/org.openhab.core.io.transport.upnp.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.upnp.tests/NOTICE
rename to itests/org.openhab.core.io.transport.upnp.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.io.transport.upnp.tests/org.eclipse.smarthome.io.transport.upnp.test.launch b/itests/org.openhab.core.io.transport.upnp.tests/org.eclipse.smarthome.io.transport.upnp.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.upnp.tests/org.eclipse.smarthome.io.transport.upnp.test.launch
rename to itests/org.openhab.core.io.transport.upnp.tests/org.eclipse.smarthome.io.transport.upnp.test.launch
diff --git a/bundles/tests/org.openhab.core.io.transport.upnp.tests/pom.xml b/itests/org.openhab.core.io.transport.upnp.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.io.transport.upnp.tests/pom.xml
rename to itests/org.openhab.core.io.transport.upnp.tests/pom.xml
index b4df28d672..9a88320b4b 100644
--- a/bundles/tests/org.openhab.core.io.transport.upnp.tests/pom.xml
+++ b/itests/org.openhab.core.io.transport.upnp.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.io.transport.upnp.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: IO UPnP Tests</name>
+  <name>openHAB Core :: Integration Tests :: IO UPnP Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.io.transport.upnp.tests/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java b/itests/org.openhab.core.io.transport.upnp.tests/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.io.transport.upnp.tests/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
rename to itests/org.openhab.core.io.transport.upnp.tests/src/test/java/org/eclipse/smarthome/io/transport/upnp/internal/UpnpIOServiceTest.java
diff --git a/bundles/tests/org.openhab.core.magic.tests/NOTICE b/itests/org.openhab.core.magic.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/NOTICE
rename to itests/org.openhab.core.magic.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.magic.tests/org.eclipse.smarthome.magic.test.launch b/itests/org.openhab.core.magic.tests/org.eclipse.smarthome.magic.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/org.eclipse.smarthome.magic.test.launch
rename to itests/org.openhab.core.magic.tests/org.eclipse.smarthome.magic.test.launch
diff --git a/bundles/tests/org.openhab.core.magic.tests/pom.xml b/itests/org.openhab.core.magic.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.magic.tests/pom.xml
rename to itests/org.openhab.core.magic.tests/pom.xml
index 473a6b805b..52cd1ef85d 100644
--- a/bundles/tests/org.openhab.core.magic.tests/pom.xml
+++ b/itests/org.openhab.core.magic.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.test.magic.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Magic Bundle Tests</name>
+  <name>openHAB Core :: Integration Tests :: Magic Bundle Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicColorLightHandlerTest.java b/itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicColorLightHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicColorLightHandlerTest.java
rename to itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicColorLightHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicDimmableLightHandlerTest.java b/itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicDimmableLightHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicDimmableLightHandlerTest.java
rename to itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicDimmableLightHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicOnOffLightHandlerTest.java b/itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicOnOffLightHandlerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicOnOffLightHandlerTest.java
rename to itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/MagicOnOffLightHandlerTest.java
diff --git a/bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java b/itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java
rename to itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicHandlerFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java b/itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java
rename to itests/org.openhab.core.magic.tests/src/test/java/org/eclipse/smarthome/magic/binding/internal/MagicServiceImplTest.java
diff --git a/bundles/tests/org.openhab.core.model.core.tests/NOTICE b/itests/org.openhab.core.model.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.core.tests/NOTICE
rename to itests/org.openhab.core.model.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.core.tests/model.profile-marker b/itests/org.openhab.core.model.core.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.core.tests/model.profile-marker
rename to itests/org.openhab.core.model.core.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.core.tests/org.eclipse.smarthome.model.core.test.launch b/itests/org.openhab.core.model.core.tests/org.eclipse.smarthome.model.core.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.model.core.tests/org.eclipse.smarthome.model.core.test.launch
rename to itests/org.openhab.core.model.core.tests/org.eclipse.smarthome.model.core.test.launch
diff --git a/bundles/tests/org.openhab.core.model.core.tests/pom.xml b/itests/org.openhab.core.model.core.tests/pom.xml
similarity index 92%
rename from bundles/tests/org.openhab.core.model.core.tests/pom.xml
rename to itests/org.openhab.core.model.core.tests/pom.xml
index 6136b2a0fd..98fa485546 100644
--- a/bundles/tests/org.openhab.core.model.core.tests/pom.xml
+++ b/itests/org.openhab.core.model.core.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.core.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Core Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Core Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.core.tests/src/test/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java b/itests/org.openhab.core.model.core.tests/src/test/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.core.tests/src/test/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java
rename to itests/org.openhab.core.model.core.tests/src/test/java/org/eclipse/smarthome/model/core/internal/folder/FolderObserverTest.java
diff --git a/bundles/tests/org.openhab.core.model.item.tests/NOTICE b/itests/org.openhab.core.model.item.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/NOTICE
rename to itests/org.openhab.core.model.item.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.item.tests/model.profile-marker b/itests/org.openhab.core.model.item.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/model.profile-marker
rename to itests/org.openhab.core.model.item.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.item.tests/org.eclipse.smarthome.model.item.tests.launch b/itests/org.openhab.core.model.item.tests/org.eclipse.smarthome.model.item.tests.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/org.eclipse.smarthome.model.item.tests.launch
rename to itests/org.openhab.core.model.item.tests/org.eclipse.smarthome.model.item.tests.launch
diff --git a/bundles/tests/org.openhab.core.model.item.tests/pom.xml b/itests/org.openhab.core.model.item.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.model.item.tests/pom.xml
rename to itests/org.openhab.core.model.item.tests/pom.xml
index 4df3f79195..6f5651acb3 100644
--- a/bundles/tests/org.openhab.core.model.item.tests/pom.xml
+++ b/itests/org.openhab.core.model.item.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.item.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Items Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Items Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider2Test.java b/itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider2Test.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider2Test.java
rename to itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProvider2Test.java
diff --git a/bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java b/itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java
rename to itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericItemProviderTest.java
diff --git a/bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java b/itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java
rename to itests/org.openhab.core.model.item.tests/src/org/eclipse/smarthome/model/item/internal/GenericMetadataProviderTest.java
diff --git a/bundles/tests/org.openhab.core.model.lsp.tests/NOTICE b/itests/org.openhab.core.model.lsp.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.lsp.tests/NOTICE
rename to itests/org.openhab.core.model.lsp.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.lsp.tests/model.profile-marker b/itests/org.openhab.core.model.lsp.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.lsp.tests/model.profile-marker
rename to itests/org.openhab.core.model.lsp.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.lsp.tests/pom.xml b/itests/org.openhab.core.model.lsp.tests/pom.xml
similarity index 70%
rename from bundles/tests/org.openhab.core.model.lsp.tests/pom.xml
rename to itests/org.openhab.core.model.lsp.tests/pom.xml
index bff76fd52e..aa3b8dde76 100644
--- a/bundles/tests/org.openhab.core.model.lsp.tests/pom.xml
+++ b/itests/org.openhab.core.model.lsp.tests/pom.xml
@@ -4,14 +4,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.lsp.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Language Server Tests</name>
+  <name>openHAB Core :: Integration Tests :: Language Server Tests</name>
 
 </project>
diff --git a/bundles/tests/org.openhab.core.model.lsp.tests/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java b/itests/org.openhab.core.model.lsp.tests/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.lsp.tests/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java
rename to itests/org.openhab.core.model.lsp.tests/src/test/java/org/eclipse/smarthome/model/lsp/internal/MappingUriExtensionsTest.java
diff --git a/bundles/tests/org.openhab.core.model.persistence.tests/NOTICE b/itests/org.openhab.core.model.persistence.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.persistence.tests/NOTICE
rename to itests/org.openhab.core.model.persistence.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.persistence.tests/model.profile-marker b/itests/org.openhab.core.model.persistence.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.persistence.tests/model.profile-marker
rename to itests/org.openhab.core.model.persistence.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.persistence.tests/pom.xml b/itests/org.openhab.core.model.persistence.tests/pom.xml
similarity index 87%
rename from bundles/tests/org.openhab.core.model.persistence.tests/pom.xml
rename to itests/org.openhab.core.model.persistence.tests/pom.xml
index 7489d80a49..61a4a32663 100644
--- a/bundles/tests/org.openhab.core.model.persistence.tests/pom.xml
+++ b/itests/org.openhab.core.model.persistence.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.persistence.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Persistence Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Persistence Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java b/itests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java
rename to itests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/extensions/PersistenceExtensionsTest.java
diff --git a/bundles/tests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java b/itests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java
rename to itests/org.openhab.core.model.persistence.tests/src/test/java/org/eclipse/smarthome/model/persistence/tests/TestPersistenceService.java
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/NOTICE b/itests/org.openhab.core.model.rule.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/NOTICE
rename to itests/org.openhab.core.model.rule.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/model.profile-marker b/itests/org.openhab.core.model.rule.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/model.profile-marker
rename to itests/org.openhab.core.model.rule.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/org.eclipse.smarthome.model.rule.tests.launch b/itests/org.openhab.core.model.rule.tests/org.eclipse.smarthome.model.rule.tests.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/org.eclipse.smarthome.model.rule.tests.launch
rename to itests/org.openhab.core.model.rule.tests/org.eclipse.smarthome.model.rule.tests.launch
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/pom.xml b/itests/org.openhab.core.model.rule.tests/pom.xml
similarity index 94%
rename from bundles/tests/org.openhab.core.model.rule.tests/pom.xml
rename to itests/org.openhab.core.model.rule.tests/pom.xml
index 60621d3519..2f7fea73ea 100644
--- a/bundles/tests/org.openhab.core.model.rule.tests/pom.xml
+++ b/itests/org.openhab.core.model.rule.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.rule.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Rules Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Rules Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/src/.gitignore b/itests/org.openhab.core.model.rule.tests/src/.gitignore
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/src/.gitignore
rename to itests/org.openhab.core.model.rule.tests/src/.gitignore
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java b/itests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java
rename to itests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleExecutionTest.java
diff --git a/bundles/tests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java b/itests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java
rename to itests/org.openhab.core.model.rule.tests/src/org/eclipse/smarthome/model/rule/runtime/internal/engine/RuleTriggerTest.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/NOTICE b/itests/org.openhab.core.model.script.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/NOTICE
rename to itests/org.openhab.core.model.script.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.script.tests/model.profile-marker b/itests/org.openhab.core.model.script.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/model.profile-marker
rename to itests/org.openhab.core.model.script.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.script.tests/org.eclipse.smarthome.model.script.tests.launch b/itests/org.openhab.core.model.script.tests/org.eclipse.smarthome.model.script.tests.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/org.eclipse.smarthome.model.script.tests.launch
rename to itests/org.openhab.core.model.script.tests/org.eclipse.smarthome.model.script.tests.launch
diff --git a/bundles/tests/org.openhab.core.model.script.tests/pom.xml b/itests/org.openhab.core.model.script.tests/pom.xml
similarity index 93%
rename from bundles/tests/org.openhab.core.model.script.tests/pom.xml
rename to itests/org.openhab.core.model.script.tests/pom.xml
index e078279b70..4eb6c624bc 100644
--- a/bundles/tests/org.openhab.core.model.script.tests/pom.xml
+++ b/itests/org.openhab.core.model.script.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.script.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Script Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Script Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java
rename to itests/org.openhab.core.model.script.tests/src/org/eclipse/smarthome/model/script/tests/lib/NumberExtensionsTest.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/actions/ScriptExecutionTest.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/engine/ScriptEngineOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/lib/NumberExtensionsTest.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/AbstractScheduler.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockClosure.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java b/itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java
rename to itests/org.openhab.core.model.script.tests/src/test/java/org/eclipse/smarthome/model/script/scheduler/test/MockScheduler.java
diff --git a/bundles/tests/org.openhab.core.model.script.tests/src/test/resources/quartz-test.properties b/itests/org.openhab.core.model.script.tests/src/test/resources/quartz-test.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.model.script.tests/src/test/resources/quartz-test.properties
rename to itests/org.openhab.core.model.script.tests/src/test/resources/quartz-test.properties
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/NOTICE b/itests/org.openhab.core.model.thing.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/NOTICE
rename to itests/org.openhab.core.model.thing.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/model.profile-marker b/itests/org.openhab.core.model.thing.tests/model.profile-marker
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/model.profile-marker
rename to itests/org.openhab.core.model.thing.tests/model.profile-marker
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/org.eclipse.smarthome.model.thing.tests.launch b/itests/org.openhab.core.model.thing.tests/org.eclipse.smarthome.model.thing.tests.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/org.eclipse.smarthome.model.thing.tests.launch
rename to itests/org.openhab.core.model.thing.tests/org.eclipse.smarthome.model.thing.tests.launch
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/pom.xml b/itests/org.openhab.core.model.thing.tests/pom.xml
similarity index 96%
rename from bundles/tests/org.openhab.core.model.thing.tests/pom.xml
rename to itests/org.openhab.core.model.thing.tests/pom.xml
index ba07687ddd..f287fb54dc 100644
--- a/bundles/tests/org.openhab.core.model.thing.tests/pom.xml
+++ b/itests/org.openhab.core.model.thing.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.model.thing.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Model Thing Tests</name>
+  <name>openHAB Core :: Integration Tests :: Model Thing Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/internal/GenericThingProviderMultipleBundlesTest.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/GenericItemChannelLinkProviderJavaTest.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingHandlerFactory.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingHandlerFactory.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingHandlerFactory.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingHandlerFactory.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingTypeProvider.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingTypeProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingTypeProvider.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/DumbThingTypeProvider.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericItemChannelLinkProviderTest.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest2.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest3.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/GenericThingProviderTest4.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueChannelTypeProvider.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueChannelTypeProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueChannelTypeProvider.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueChannelTypeProvider.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueConfigDescriptionProvider.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueConfigDescriptionProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueConfigDescriptionProvider.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueConfigDescriptionProvider.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactory.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactory.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactory.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactory.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactoryX.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactoryX.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactoryX.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingHandlerFactoryX.java
diff --git a/bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingTypeProvider.java b/itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingTypeProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingTypeProvider.java
rename to itests/org.openhab.core.model.thing.tests/src/test/java/org/eclipse/smarthome/model/thing/test/hue/TestHueThingTypeProvider.java
diff --git a/bundles/tests/org.openhab.core.semantics.tests/NOTICE b/itests/org.openhab.core.semantics.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.semantics.tests/NOTICE
rename to itests/org.openhab.core.semantics.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.semantics.tests/org.eclipse.smarthome.core.semantics.test.launch b/itests/org.openhab.core.semantics.tests/org.eclipse.smarthome.core.semantics.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.semantics.tests/org.eclipse.smarthome.core.semantics.test.launch
rename to itests/org.openhab.core.semantics.tests/org.eclipse.smarthome.core.semantics.test.launch
diff --git a/bundles/tests/org.openhab.core.semantics.tests/pom.xml b/itests/org.openhab.core.semantics.tests/pom.xml
similarity index 71%
rename from bundles/tests/org.openhab.core.semantics.tests/pom.xml
rename to itests/org.openhab.core.semantics.tests/pom.xml
index 66542f25fd..af714f5d7f 100644
--- a/bundles/tests/org.openhab.core.semantics.tests/pom.xml
+++ b/itests/org.openhab.core.semantics.tests/pom.xml
@@ -5,14 +5,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.semantics.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Semantics Tests</name>
+  <name>openHAB Core :: Integration Tests :: Semantics Tests</name>
 
 </project>
diff --git a/bundles/tests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java b/itests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java
rename to itests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/SemanticTagsTest.java
diff --git a/bundles/tests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java b/itests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java
rename to itests/org.openhab.core.semantics.tests/src/test/java/org/eclipse/smarthome/core/semantics/internal/SemanticsServiceImplTest.java
diff --git a/bundles/tests/org.openhab.core.storage.json.tests/NOTICE b/itests/org.openhab.core.storage.json.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.json.tests/NOTICE
rename to itests/org.openhab.core.storage.json.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.storage.json.tests/org.eclipse.smarthome.storage.json.test.launch b/itests/org.openhab.core.storage.json.tests/org.eclipse.smarthome.storage.json.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.json.tests/org.eclipse.smarthome.storage.json.test.launch
rename to itests/org.openhab.core.storage.json.tests/org.eclipse.smarthome.storage.json.test.launch
diff --git a/bundles/tests/org.openhab.core.storage.json.tests/pom.xml b/itests/org.openhab.core.storage.json.tests/pom.xml
similarity index 88%
rename from bundles/tests/org.openhab.core.storage.json.tests/pom.xml
rename to itests/org.openhab.core.storage.json.tests/pom.xml
index 41b3510b23..f326bca894 100644
--- a/bundles/tests/org.openhab.core.storage.json.tests/pom.xml
+++ b/itests/org.openhab.core.storage.json.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.storage.json.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Storage JSON Tests</name>
+  <name>openHAB Core :: Integration Tests :: Storage JSON Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JSonStorageTest.java b/itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JSonStorageTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JSonStorageTest.java
rename to itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JSonStorageTest.java
diff --git a/bundles/tests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java b/itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java
rename to itests/org.openhab.core.storage.json.tests/src/main/java/org/eclipse/smarthome/storage/json/internal/JsonStorageServiceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/.classpath b/itests/org.openhab.core.tests/.classpath
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/.classpath
rename to itests/org.openhab.core.tests/.classpath
diff --git a/bundles/tests/org.openhab.core.tests/.project b/itests/org.openhab.core.tests/.project
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/.project
rename to itests/org.openhab.core.tests/.project
diff --git a/bundles/tests/org.openhab.core.tests/.settings/org.eclipse.core.resources.prefs b/itests/org.openhab.core.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/.settings/org.eclipse.core.resources.prefs
rename to itests/org.openhab.core.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/.settings/org.eclipse.m2e.core.prefs b/itests/org.openhab.core.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.mapdb.tests/.settings/org.eclipse.m2e.core.prefs
rename to itests/org.openhab.core.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/bundles/tests/org.openhab.core.storage.mapdb.tests/NOTICE b/itests/org.openhab.core.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.storage.mapdb.tests/NOTICE
rename to itests/org.openhab.core.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.tests/integration-test.bndrun b/itests/org.openhab.core.tests/integration-test.bndrun
similarity index 94%
rename from bundles/tests/org.openhab.core.tests/integration-test.bndrun
rename to itests/org.openhab.core.tests/integration-test.bndrun
index dc8510c980..76575df3cd 100644
--- a/bundles/tests/org.openhab.core.tests/integration-test.bndrun
+++ b/itests/org.openhab.core.tests/integration-test.bndrun
@@ -1,6 +1,6 @@
 -standalone: \
-    ../../../bom/runtime-index/target/index.xml;name="runtime",\
-    ../../../bom/test-index/target/index.xml;name="test",\
+    ../../bom/runtime-index/target/index.xml;name="runtime",\
+    ../../bom/test-index/target/index.xml;name="test",\
     target/index.xml;name="self"
 
 -resolve.effective: active
diff --git a/bundles/tests/org.openhab.core.tests/pom.xml b/itests/org.openhab.core.tests/pom.xml
similarity index 93%
rename from bundles/tests/org.openhab.core.tests/pom.xml
rename to itests/org.openhab.core.tests/pom.xml
index edee078a9a..b66a7b371b 100644
--- a/bundles/tests/org.openhab.core.tests/pom.xml
+++ b/itests/org.openhab.core.tests/pom.xml
@@ -5,14 +5,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.tests</artifactId>
 
-  <name>openHAB Core :: Bundles :: Tests :: Tests</name>
+  <name>openHAB Core :: Integration Tests :: Tests</name>
 
   <dependencies>
     <dependency>
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/auth/client/oauth2/AccessTokenResponseTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheAsyncTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheMapTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/cache/ExpiringCacheTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/QueueingThreadPoolExecutorTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadFactoryBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/ThreadPoolManagerTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/common/osgi/ResourceBundleClassLoaderTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactoryTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactoryTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/AbstractEventFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/ItemEventFactoryTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/ItemEventFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/ItemEventFactoryTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/events/ItemEventFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/common/SafeCallerImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/events/OSGiEventManagerOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/I18nProviderImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/i18n/TranslationProviderOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemStateConverterImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemTagTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/ItemUpdaterOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/items/MetadataRegistryImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterMiscTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronAdjusterTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/CronSchedulerImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/DelegatedSchedulerTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/PeriodicSchedulerImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/scheduler/SchedulerImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/service/ReadyServiceImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/internal/types/StateDescriptionFragmentImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GenericItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GenericItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GenericItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GenericItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/GroupItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ItemRegistryImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/ManagedItemProviderOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/MetadataKeyTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/TestItem.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/dto/ItemDTOMapperTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/items/events/AbstractItemEventSubscriberOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/CoreItemFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/CallItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/CallItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/CallItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/CallItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ColorItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ContactItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DateTimeItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/DimmerItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/ImageItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/LocationItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/NumberItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/PlayerItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/RollershutterItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StateUtil.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StateUtil.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StateUtil.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StateUtil.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StringItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StringItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StringItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/StringItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/items/SwitchItemTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/ArithmeticGroupFunctionTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeGroupFunctionTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DateTimeTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/DecimalTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/HSBTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OnOffTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/OpenClosedTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PercentTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/PointTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeArithmeticGroupFunctionTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/QuantityTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringListTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/StringTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/library/types/UpDownTypeTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/HttpServiceUtilTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/NetUtilTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/NetUtilTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/NetUtilTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/net/NetUtilTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/AbstractWatchServiceTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionServiceImplTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionServiceImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionServiceImplTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/service/StateDescriptionServiceImplTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/SmartHomeUnitsTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/SmartHomeUnitsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/SmartHomeUnitsTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/SmartHomeUnitsTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/StateDescriptionFragmentBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/VolumetricFlowRateTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/VolumetricFlowRateTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/VolumetricFlowRateTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/VolumetricFlowRateTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/types/util/UnitUtilsTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/util/HexUtilsTest.java b/itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/util/HexUtilsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/util/HexUtilsTest.java
rename to itests/org.openhab.core.tests/src/main/java/org/eclipse/smarthome/core/util/HexUtilsTest.java
diff --git a/bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/otherResourceName_en.properties b/itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/otherResourceName_en.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/otherResourceName_en.properties
rename to itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/otherResourceName_en.properties
diff --git a/bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName.properties b/itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName.properties
rename to itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName.properties
diff --git a/bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_en.properties b/itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_en.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_en.properties
rename to itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_en.properties
diff --git a/bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_fr.properties b/itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_fr.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_fr.properties
rename to itests/org.openhab.core.tests/src/main/resources/ESH-INF/i18n/resourceName_fr.properties
diff --git a/bundles/tests/org.openhab.core.tests/NOTICE b/itests/org.openhab.core.thing.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.tests/NOTICE
rename to itests/org.openhab.core.thing.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch b/itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch
rename to itests/org.openhab.core.thing.tests/org.eclipse.smarthome.core.thing.test.launch
diff --git a/bundles/tests/org.openhab.core.thing.tests/pom.xml b/itests/org.openhab.core.thing.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.thing.tests/pom.xml
rename to itests/org.openhab.core.thing.tests/pom.xml
index ff27b37e02..1db68cf5f5 100644
--- a/bundles/tests/org.openhab.core.thing.tests/pom.xml
+++ b/itests/org.openhab.core.thing.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.thing.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Thing Tests</name>
+  <name>openHAB Core :: Integration Tests :: Thing Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test.properties b/itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test.properties
rename to itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test.properties
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test_de.properties b/itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test_de.properties
rename to itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/firmware-test_de.properties
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status.properties b/itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status.properties
rename to itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status.properties
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status_de.properties b/itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status_de.properties
rename to itests/org.openhab.core.thing.tests/src/main/resources/ESH-INF/i18n/thing-status_de.properties
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelGroupUIDTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ChannelUIDTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/SystemWideChannelTypesTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingPropertiesTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/ThingUIDTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/UIDTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/BindingBaseClassesOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ChangeThingTypeOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/ThingFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ChannelBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/builder/ThingBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/binding/firmware/FirmwareTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/events/ThingEventFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/factory/ManagedThingProviderOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/Constants.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareEventFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServiceFirmwareRestrictionTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/FirmwareUpdateServicePrerequisiteVersionTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/firmware/ModelRestrictedFirmwareUpdateServiceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/i18n/ThingStatusInfoI18nLocalizationServiceOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/AutoUpdateManagerTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelItemProviderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ChannelStateDescriptionProviderOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/CommunicationManagerTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/SimpleThingTypeProvider.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingLinkManagerOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiJavaTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingManagerTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/ThingRegistryOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareRegistryOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/FirmwareUpdateServiceTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/firmware/ProgressCallbackTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/RawButtonToggleSwitchProfileTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemDefaultProfileTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemFollowProfileTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemOffsetProfileTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/internal/profiles/SystemProfileFactoryTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/ItemChannelLinkOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/link/LinkEventOSGiTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/testutil/i18n/DefaultLocaleSetter.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelGroupTypeBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ChannelTypeBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/type/ThingTypeBuilderTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHandlerHelperTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java b/itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java
rename to itests/org.openhab.core.thing.tests/src/test/java/org/eclipse/smarthome/core/thing/util/ThingHelperTest.java
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/resources/firmware.txt b/itests/org.openhab.core.thing.tests/src/test/resources/firmware.txt
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/resources/firmware.txt
rename to itests/org.openhab.core.thing.tests/src/test/resources/firmware.txt
diff --git a/bundles/tests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties b/itests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties
rename to itests/org.openhab.core.thing.tests/src/test/resources/test-bundle-pool/thingStatusInfoI18nTest.bundle/src/main/resources/ESH-INF/i18n/test-translations.properties
diff --git a/bundles/tests/org.openhab.core.thing.tests/NOTICE b/itests/org.openhab.core.thing.xml.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.tests/NOTICE
rename to itests/org.openhab.core.thing.xml.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/example/example.xml b/itests/org.openhab.core.thing.xml.tests/example/example.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/example/example.xml
rename to itests/org.openhab.core.thing.xml.tests/example/example.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/org.eclipse.smarthome.core.thing.xml.test.launch b/itests/org.openhab.core.thing.xml.tests/org.eclipse.smarthome.core.thing.xml.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/org.eclipse.smarthome.core.thing.xml.test.launch
rename to itests/org.openhab.core.thing.xml.tests/org.eclipse.smarthome.core.thing.xml.test.launch
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/pom.xml b/itests/org.openhab.core.thing.xml.tests/pom.xml
similarity index 91%
rename from bundles/tests/org.openhab.core.thing.xml.tests/pom.xml
rename to itests/org.openhab.core.thing.xml.tests/pom.xml
index 4052ba3307..bd0170d442 100644
--- a/bundles/tests/org.openhab.core.thing.xml.tests/pom.xml
+++ b/itests/org.openhab.core.thing.xml.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.thing.xml.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Thing XML Tests</name>
+  <name>openHAB Core :: Integration Tests :: Thing XML Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/internal/XmlHelperTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesI18nTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ChannelTypesTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ConfigDescriptionsTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/Example.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/Example.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/Example.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/Example.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemChannelsInChannelGroupsTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/SystemWideChannelTypesTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypeI18nTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java b/itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java
rename to itests/org.openhab.core.thing.xml.tests/src/test/java/org/eclipse/smarthome/core/thing/xml/test/ThingTypesTest.java
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/i18n/somebinding.properties b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/i18n/somebinding.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/i18n/somebinding.properties
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/i18n/somebinding.properties
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesI18nTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ChannelTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ConfigDescriptionsTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/i18n/SystemChannels_de.properties b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/i18n/SystemChannels_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/i18n/SystemChannels_de.properties
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/i18n/SystemChannels_de.properties
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannels.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsInChannelGroups.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsNoThingTypes.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/SystemChannelsUser.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/binding/binding.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/binding/binding.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/ThingTypesTest.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/i18n/yahooweather_de.properties
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/thing/thing-types.xml b/itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
rename to itests/org.openhab.core.thing.xml.tests/src/test/resources/test-bundle-pool/yahooweather.bundle/src/main/resources/ESH-INF/thing/thing-types.xml
diff --git a/bundles/tests/org.openhab.core.thing.xml.tests/NOTICE b/itests/org.openhab.core.transform.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.thing.xml.tests/NOTICE
rename to itests/org.openhab.core.transform.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.transform.tests/org.eclipse.smarthome.core.transform.test.launch b/itests/org.openhab.core.transform.tests/org.eclipse.smarthome.core.transform.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.transform.tests/org.eclipse.smarthome.core.transform.test.launch
rename to itests/org.openhab.core.transform.tests/org.eclipse.smarthome.core.transform.test.launch
diff --git a/bundles/tests/org.openhab.core.transform.tests/pom.xml b/itests/org.openhab.core.transform.tests/pom.xml
similarity index 94%
rename from bundles/tests/org.openhab.core.transform.tests/pom.xml
rename to itests/org.openhab.core.transform.tests/pom.xml
index 749672c306..e8260bd8fa 100644
--- a/bundles/tests/org.openhab.core.transform.tests/pom.xml
+++ b/itests/org.openhab.core.transform.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.transform.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Transform Test</name>
+  <name>openHAB Core :: Integration Tests :: Transform Test</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.transform.tests/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java b/itests/org.openhab.core.transform.tests/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.transform.tests/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java
rename to itests/org.openhab.core.transform.tests/src/test/java/org/eclipse/smarthome/core/transform/actions/TransformationTest.java
diff --git a/bundles/tests/org.openhab.core.transform.tests/NOTICE b/itests/org.openhab.core.ui.icon.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.transform.tests/NOTICE
rename to itests/org.openhab.core.ui.icon.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.ui.icon.tests/org.eclipse.smarthome.ui.icon.test.launch b/itests/org.openhab.core.ui.icon.tests/org.eclipse.smarthome.ui.icon.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.icon.tests/org.eclipse.smarthome.ui.icon.test.launch
rename to itests/org.openhab.core.ui.icon.tests/org.eclipse.smarthome.ui.icon.test.launch
diff --git a/bundles/tests/org.openhab.core.ui.icon.tests/pom.xml b/itests/org.openhab.core.ui.icon.tests/pom.xml
similarity index 86%
rename from bundles/tests/org.openhab.core.ui.icon.tests/pom.xml
rename to itests/org.openhab.core.ui.icon.tests/pom.xml
index bff68fa29e..2a40e00022 100644
--- a/bundles/tests/org.openhab.core.ui.icon.tests/pom.xml
+++ b/itests/org.openhab.core.ui.icon.tests/pom.xml
@@ -3,15 +3,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.ui.icon.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: UI Icon Tests</name>
+  <name>openHAB Core :: Integration Tests :: UI Icon Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/AbstractResourceIconProviderTest.java b/itests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/AbstractResourceIconProviderTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/AbstractResourceIconProviderTest.java
rename to itests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/AbstractResourceIconProviderTest.java
diff --git a/bundles/tests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java b/itests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java
rename to itests/org.openhab.core.ui.icon.tests/src/test/java/org/eclipse/smarthome/ui/icon/internal/IconServletTest.java
diff --git a/bundles/tests/org.openhab.core.ui.icon.tests/NOTICE b/itests/org.openhab.core.ui.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.icon.tests/NOTICE
rename to itests/org.openhab.core.ui.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.ui.tests/org.eclipse.smarthome.ui.test.launch b/itests/org.openhab.core.ui.tests/org.eclipse.smarthome.ui.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.tests/org.eclipse.smarthome.ui.test.launch
rename to itests/org.openhab.core.ui.tests/org.eclipse.smarthome.ui.test.launch
diff --git a/bundles/tests/org.openhab.core.ui.tests/pom.xml b/itests/org.openhab.core.ui.tests/pom.xml
similarity index 83%
rename from bundles/tests/org.openhab.core.ui.tests/pom.xml
rename to itests/org.openhab.core.ui.tests/pom.xml
index f328b79c6b..c9f7495965 100644
--- a/bundles/tests/org.openhab.core.ui.tests/pom.xml
+++ b/itests/org.openhab.core.ui.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.ui.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: UI Tests</name>
+  <name>openHAB Core :: Integration Tests :: UI Tests</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.ui.tests/src/main/resources/readme.txt b/itests/org.openhab.core.ui.tests/src/main/resources/readme.txt
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.tests/src/main/resources/readme.txt
rename to itests/org.openhab.core.ui.tests/src/main/resources/readme.txt
diff --git a/bundles/tests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java b/itests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
rename to itests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/items/ItemUIRegistryImplTest.java
diff --git a/bundles/tests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java b/itests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
rename to itests/org.openhab.core.ui.tests/src/test/java/org/eclipse/smarthome/ui/internal/proxy/ProxyServletServiceTest.java
diff --git a/bundles/tests/org.openhab.core.ui.tests/NOTICE b/itests/org.openhab.core.voice.tests/NOTICE
similarity index 100%
rename from bundles/tests/org.openhab.core.ui.tests/NOTICE
rename to itests/org.openhab.core.voice.tests/NOTICE
diff --git a/bundles/tests/org.openhab.core.voice.tests/org.eclipse.smarthome.core.voice.test.launch b/itests/org.openhab.core.voice.tests/org.eclipse.smarthome.core.voice.test.launch
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/org.eclipse.smarthome.core.voice.test.launch
rename to itests/org.openhab.core.voice.tests/org.eclipse.smarthome.core.voice.test.launch
diff --git a/bundles/tests/org.openhab.core.voice.tests/pom.xml b/itests/org.openhab.core.voice.tests/pom.xml
similarity index 95%
rename from bundles/tests/org.openhab.core.voice.tests/pom.xml
rename to itests/org.openhab.core.voice.tests/pom.xml
index 90a6121bca..f4a253acc8 100644
--- a/bundles/tests/org.openhab.core.voice.tests/pom.xml
+++ b/itests/org.openhab.core.voice.tests/pom.xml
@@ -4,15 +4,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles.tests</groupId>
-    <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+    <groupId>org.openhab.core.itests</groupId>
+    <artifactId>org.openhab.core.reactor.itests</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.openhab.core.voice.tests</artifactId>
   <packaging>eclipse-test-plugin</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests :: Voice Test</name>
+  <name>openHAB Core :: Integration Tests :: Voice Test</name>
 
   <build>
     <plugins>
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/STTExceptionTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionErrorEventTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/SpeechRecognitionEventTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/TTSExceptionTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioManagerStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/AudioSourceStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/ConsoleStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/HumanLanguageInterpreterStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/KSServiceStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/STTServiceStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/SinkStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/TTSServiceStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/internal/VoiceStub.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/javavoicemanager/VoiceManagerTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/InterpretCommandTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/SayCommandTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoiceConsoleCommandExtensionTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java b/itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
rename to itests/org.openhab.core.voice.tests/src/test/java/org/eclipse/smarthome/core/voice/voiceconsolecommandextension/VoicesCommandTest.java
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/goforward.raw b/itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/goforward.raw
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/goforward.raw
rename to itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/goforward.raw
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/hellowworld.raw b/itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/hellowworld.raw
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/hellowworld.raw
rename to itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/hellowworld.raw
diff --git a/bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/marieta.raw b/itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/marieta.raw
similarity index 100%
rename from bundles/tests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/marieta.raw
rename to itests/org.openhab.core.voice.tests/src/test/resources/org/eclipse/smarthome/io/voice/internal/marieta.raw
diff --git a/bundles/tests/pom.xml b/itests/pom.xml
similarity index 73%
rename from bundles/tests/pom.xml
rename to itests/pom.xml
index 7bbc1394f9..7af3ecad6d 100644
--- a/bundles/tests/pom.xml
+++ b/itests/pom.xml
@@ -1,20 +1,19 @@
 <?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/maven-v4_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/maven-v4_0_0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.openhab.core.bundles</groupId>
-    <artifactId>org.openhab.core.reactor.bundles</artifactId>
+    <groupId>org.openhab.core</groupId>
+    <artifactId>org.openhab.core.reactor</artifactId>
     <version>2.5.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>org.openhab.core.bundles.tests</groupId>
-  <artifactId>org.openhab.core.reactor.bundles.tests</artifactId>
+  <groupId>org.openhab.core.itests</groupId>
+  <artifactId>org.openhab.core.reactor.itests</artifactId>
   <packaging>pom</packaging>
 
-  <name>openHAB Core :: Bundles :: Tests</name>
+  <name>openHAB Core :: Integration Tests</name>
 
   <modules>
     <!-- <module>org.openhab.core.automation.core.tests</module> -->
@@ -57,7 +56,6 @@
     <!-- <module>org.openhab.core.model.script.tests</module> -->
     <!-- <module>org.openhab.core.model.thing.tests</module> -->
     <!-- <module>org.openhab.core.storage.json.tests</module> -->
-    <module>org.openhab.core.storage.mapdb.tests</module>
     <!-- <module>org.openhab.core.magic.tests</module> -->
     <!-- <module>org.openhab.core.ui.tests</module> -->
     <!-- <module>org.openhab.core.ui.icon.tests</module> -->
@@ -76,4 +74,35 @@
     </profile>
   </profiles>
 
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <configuration>
+            <archive>
+              <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+            </archive>
+            <skipIfEmpty>true</skipIfEmpty>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>bnd-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.openhab.core.bom</groupId>
+      <artifactId>org.openhab.core.bom.compile</artifactId>
+      <type>pom</type>
+    </dependency>
+  </dependencies>
+
 </project>
diff --git a/pom.xml b/pom.xml
index e520f1ab59..4f27dda062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -518,6 +518,20 @@ Import-Package: \\
 
   </build>
 
+  <profiles>
+    <profile>
+      <id>skip-itest</id>
+      <activation>
+        <property>
+          <name>!skipTests</name>
+        </property>
+      </activation>
+      <modules>
+        <module>itests</module>
+      </modules>
+    </profile>
+  </profiles>
+    
   <modules>
     <module>bom</module>
     <module>demo</module>