diff --git a/CODEOWNERS b/CODEOWNERS
index ddc86dcd3f5b7..233346025a35b 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -14,8 +14,6 @@
 /addons/binding/org.openhab.binding.nikohomecontrol/ @mherwege
 /addons/binding/org.openhab.binding.onkyo/ @pail23 @paulianttila
 /addons/binding/org.openhab.binding.samsungtv/ @paulianttila
-/addons/binding/org.openhab.binding.systeminfo/ @svilenvul
-/addons/binding/org.openhab.binding.systeminfo.test/ @svilenvul
 /addons/binding/org.openhab.binding.yamahareceiver/ @davidgraeff @zarusz
 /addons/binding/org.openhab.binding.yamahareceiver.test/ @davidgraeff @zarusz
 /addons/binding/org.openhab.binding.zoneminder/ @Mr-Eskildsen
@@ -162,6 +160,7 @@
 /bundles/org.openhab.binding.spotify/ @Hilbrand
 /bundles/org.openhab.binding.squeezebox/ @digitaldan @mhilbush
 /bundles/org.openhab.binding.synopanalyzer/ @clinique
+/bundles/org.openhab.binding.systeminfo/ @svilenvul
 /bundles/org.openhab.binding.tado/ @dfrommi
 /bundles/org.openhab.binding.tankerkoenig/ @dolic @JueBag
 /bundles/org.openhab.binding.tellstick/ @jarlebh
@@ -213,6 +212,7 @@
 /itests/org.openhab.binding.mqtt.homie.tests/ @davidgraeff
 /itests/org.openhab.binding.nest.tests/ @wborn
 /itests/org.openhab.binding.ntp.tests/ @marcelrv
+/itests/org.openhab.binding.systeminfo.tests/ @svilenvul
 /itests/org.openhab.binding.tradfri.tests/ @cweitkamp @kaikreuzer
 /itests/org.openhab.binding.wemo.tests/ @hmerk
 /itests/org.openhab.persistence.mapdb.tests/ @mkhl
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/.classpath b/addons/binding/org.openhab.binding.systeminfo.test/.classpath
deleted file mode 100644
index 64777f25c82a4..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF
deleted file mode 100644
index bc57dc5f0f3fd..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,27 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.openhab.binding.systeminfo.test
-Bundle-ClassPath: .
-Bundle-ManifestVersion: 2
-Bundle-Name: Systeminfo Binding Tests
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.openhab.binding.systeminfo.test;singleton:=true
-Bundle-Vendor: openHAB
-Bundle-Version: 2.5.0.qualifier
-Fragment-Host: org.openhab.binding.systeminfo
-Import-Package: 
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.config.discovery,
- org.eclipse.smarthome.config.discovery.inbox,
- org.eclipse.smarthome.core.common.registry,
- org.eclipse.smarthome.core.items,
- org.eclipse.smarthome.core.library.items,
- org.eclipse.smarthome.core.thing.link,
- org.eclipse.smarthome.test.java,
- org.eclipse.smarthome.test.storage,
- org.hamcrest;core=split,
- org.junit;version="4.0.0",
- org.mockito,
- org.mockito.stubbing,
- org.osgi.framework,
- org.osgi.service.component,
- org.slf4j
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/build.properties b/addons/binding/org.openhab.binding.systeminfo.test/build.properties
deleted file mode 100644
index 8c2120c833e7a..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo.test/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/test/java
-output.. = target/classes
-bin.includes = META-INF/,\
-               .,\
-               NOTICE
-
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/org.openhab.binding.systeminfo.test.launch b/addons/binding/org.openhab.binding.systeminfo.test/org.openhab.binding.systeminfo.test.launch
deleted file mode 100644
index 9996ba2beb464..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo.test/org.openhab.binding.systeminfo.test.launch
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<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="default_auto_start" value="true"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.openhab.binding.systeminfo.test"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.openhab.binding.systeminfo.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.openhab.binding.systeminfo.test"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<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.collections@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.scr@1:true,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.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,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.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.jetty.client@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,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.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@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,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.discovery@default:default,org.eclipse.smarthome.config.xml@default:default,org.eclipse.smarthome.core.thing.xml@default:default,org.eclipse.smarthome.core.thing@default:true,org.eclipse.smarthome.core@default:true,org.eclipse.smarthome.io.console@default:default,org.eclipse.smarthome.test@default:default,org.openhab.binding.systeminfo.test@default:false,org.openhab.binding.systeminfo@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/addons/binding/org.openhab.binding.systeminfo.test/pom.xml b/addons/binding/org.openhab.binding.systeminfo.test/pom.xml
deleted file mode 100644
index 774ec471afc9f..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo.test/pom.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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.binding</groupId>
-    <artifactId>pom</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.openhab.binding.systeminfo.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
-
-  <name>Systeminfo Binding Test</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>${tycho-groupid}</groupId>
-        <artifactId>tycho-surefire-plugin</artifactId>
-        <configuration>
-          <providerHint>junit47</providerHint>
-          <dependencies>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.equinox.event</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.equinox.ds</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.openhab.core.config.xml</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.openhab.core.thing.xml</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.openhab.core.binding.xml</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <!-- Required Bundles to enable LOGGING -->
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.qos.logback.classic</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.qos.logback.core</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>ch.qos.logback.slf4j</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-          </dependencies>
-          <defaultStartLevel>
-            <level>4</level>
-            <autoStart>true</autoStart>
-          </defaultStartLevel>
-          <redirectTestOutputToFile>false</redirectTestOutputToFile>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>
diff --git a/addons/binding/org.openhab.binding.systeminfo/.classpath b/addons/binding/org.openhab.binding.systeminfo/.classpath
deleted file mode 100644
index 6c94890f268da..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-  <classpathentry kind="con"
-    path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
-  <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins" />
-  <classpathentry kind="src" path="src/main/java" />
-  <classpathentry exported="true" kind="lib" path="lib/jna-platform-5.2.0.jar" />
-  <classpathentry exported="true" kind="lib" path="lib/jna-5.2.0.jar" />
-  <classpathentry exported="true" kind="lib" path="lib/oshi-core-3.13.0.jar" />
-  <classpathentry kind="output" path="target/classes" />
-</classpath>
diff --git a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/binding/binding.xml b/addons/binding/org.openhab.binding.systeminfo/ESH-INF/binding/binding.xml
deleted file mode 100644
index 2e7926552ed2a..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/binding/binding.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<binding:binding id="systeminfo"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xmlns:binding="https://openhab.org/schemas/binding/v1.0.0"
-		xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd">
-
-	<name>Systeminfo Binding</name>
-	<description>This binding provides information about the operating system and the hardware.</description>
-	<author>Svilen Valkanov</author>
-
-</binding:binding>
diff --git a/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF b/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF
deleted file mode 100644
index c2b33845ed3c5..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,28 +0,0 @@
-Manifest-Version: 1.0
-Automatic-Module-Name: org.openhab.binding.systeminfo
-Bundle-ActivationPolicy: lazy
-Bundle-ClassPath: 
- .,
- lib/jna-platform-5.2.0.jar,
- lib/jna-5.2.0.jar,
- lib/oshi-core-3.13.0.jar
-Bundle-ManifestVersion: 2
-Bundle-Name: Systeminfo Binding
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-SymbolicName: org.openhab.binding.systeminfo;singleton:=true
-Bundle-Vendor: openHAB
-Bundle-Version: 2.5.0.qualifier
-Import-Package: 
- org.apache.commons.lang,
- org.eclipse.jdt.annotation;resolution:=optional,
- org.eclipse.smarthome.config.core,
- org.eclipse.smarthome.config.core.validation,
- org.eclipse.smarthome.config.discovery,
- org.eclipse.smarthome.core.library.types,
- org.eclipse.smarthome.core.thing,
- org.eclipse.smarthome.core.thing.binding,
- org.eclipse.smarthome.core.thing.binding.builder,
- org.eclipse.smarthome.core.thing.type,
- org.eclipse.smarthome.core.types,
- org.slf4j
-Service-Component: OSGI-INF/*.xml
diff --git a/addons/binding/org.openhab.binding.systeminfo/OSGI-INF/.gitignore b/addons/binding/org.openhab.binding.systeminfo/OSGI-INF/.gitignore
deleted file mode 100644
index b878e882aca37..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/OSGI-INF/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.xml
diff --git a/addons/binding/org.openhab.binding.systeminfo/build.properties b/addons/binding/org.openhab.binding.systeminfo/build.properties
deleted file mode 100644
index f3b3ec62e305b..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-output.. = target/classes
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               ESH-INF/,\
-               lib/,\
-               NOTICE
-source.. = src/main/java/
diff --git a/addons/binding/org.openhab.binding.systeminfo/lib/jna-5.2.0.jar b/addons/binding/org.openhab.binding.systeminfo/lib/jna-5.2.0.jar
deleted file mode 100644
index 0b5fabdd8baa1..0000000000000
Binary files a/addons/binding/org.openhab.binding.systeminfo/lib/jna-5.2.0.jar and /dev/null differ
diff --git a/addons/binding/org.openhab.binding.systeminfo/lib/jna-platform-5.2.0.jar b/addons/binding/org.openhab.binding.systeminfo/lib/jna-platform-5.2.0.jar
deleted file mode 100644
index 472268182175c..0000000000000
Binary files a/addons/binding/org.openhab.binding.systeminfo/lib/jna-platform-5.2.0.jar and /dev/null differ
diff --git a/addons/binding/org.openhab.binding.systeminfo/lib/oshi-core-3.13.0.jar b/addons/binding/org.openhab.binding.systeminfo/lib/oshi-core-3.13.0.jar
deleted file mode 100644
index 8679bbf743010..0000000000000
Binary files a/addons/binding/org.openhab.binding.systeminfo/lib/oshi-core-3.13.0.jar and /dev/null differ
diff --git a/addons/binding/org.openhab.binding.systeminfo/pom.xml b/addons/binding/org.openhab.binding.systeminfo/pom.xml
deleted file mode 100644
index 2f6f313fb561d..0000000000000
--- a/addons/binding/org.openhab.binding.systeminfo/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><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.binding</groupId>
-    <artifactId>pom</artifactId>
-    <version>2.5.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.openhab.binding.systeminfo</artifactId>
-  <packaging>eclipse-plugin</packaging>
-
-  <name>Systeminfo Binding</name>
-
-</project>
diff --git a/addons/binding/pom.xml b/addons/binding/pom.xml
index 75afde4366c96..be41f3b785297 100644
--- a/addons/binding/pom.xml
+++ b/addons/binding/pom.xml
@@ -25,8 +25,6 @@
     <module>org.openhab.binding.nikohomecontrol</module>
     <module>org.openhab.binding.onkyo</module>
     <module>org.openhab.binding.samsungtv</module>
-    <module>org.openhab.binding.systeminfo</module>
-    <module>org.openhab.binding.systeminfo.test</module>
     <module>org.openhab.binding.zoneminder</module>
   </modules>
 </project>
diff --git a/bom/openhab-addons/pom.xml b/bom/openhab-addons/pom.xml
index 8dd1aec9de1db..b650f0ad77586 100644
--- a/bom/openhab-addons/pom.xml
+++ b/bom/openhab-addons/pom.xml
@@ -697,7 +697,7 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.openhab.binding</groupId>
+      <groupId>org.openhab.addons.bundles</groupId>
       <artifactId>org.openhab.binding.systeminfo</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/bundles/org.openhab.binding.systeminfo/.classpath b/bundles/org.openhab.binding.systeminfo/.classpath
new file mode 100644
index 0000000000000..cd04a794bfd47
--- /dev/null
+++ b/bundles/org.openhab.binding.systeminfo/.classpath
@@ -0,0 +1,32 @@
+<?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 excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" 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="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="output" path="target/classes"/>
+</classpath>
diff --git a/addons/binding/org.openhab.binding.systeminfo/.project b/bundles/org.openhab.binding.systeminfo/.project
similarity index 58%
rename from addons/binding/org.openhab.binding.systeminfo/.project
rename to bundles/org.openhab.binding.systeminfo/.project
index 3d7378ad7520c..ef162e9afc293 100644
--- a/addons/binding/org.openhab.binding.systeminfo/.project
+++ b/bundles/org.openhab.binding.systeminfo/.project
@@ -11,23 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/addons/binding/org.openhab.binding.systeminfo/NOTICE b/bundles/org.openhab.binding.systeminfo/NOTICE
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/NOTICE
rename to bundles/org.openhab.binding.systeminfo/NOTICE
diff --git a/addons/binding/org.openhab.binding.systeminfo/README.md b/bundles/org.openhab.binding.systeminfo/README.md
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/README.md
rename to bundles/org.openhab.binding.systeminfo/README.md
diff --git a/bundles/org.openhab.binding.systeminfo/pom.xml b/bundles/org.openhab.binding.systeminfo/pom.xml
new file mode 100644
index 0000000000000..2fa0c3fa8845f
--- /dev/null
+++ b/bundles/org.openhab.binding.systeminfo/pom.xml
@@ -0,0 +1,44 @@
+<?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.addons.bundles</groupId>
+    <artifactId>org.openhab.addons.reactor.bundles</artifactId>
+    <version>2.5.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.openhab.binding.systeminfo</artifactId>
+
+  <name>openHAB Add-ons :: Bundles :: Systeminfo Binding</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>5.3.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>5.3.0</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.github.oshi</groupId>
+      <artifactId>oshi-core</artifactId>
+      <version>3.13.0</version>
+      <scope>provided</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoBindingConstants.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoBindingConstants.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoBindingConstants.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoBindingConstants.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoHandlerFactory.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoHandlerFactory.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoHandlerFactory.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/SysteminfoHandlerFactory.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/discovery/SysteminfoDiscoveryService.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/handler/SysteminfoHandler.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/DeviceNotFoundException.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/DeviceNotFoundException.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/DeviceNotFoundException.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/DeviceNotFoundException.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/OSHISysteminfo.java
diff --git a/addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java b/bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
rename to bundles/org.openhab.binding.systeminfo/src/main/java/org/openhab/binding/systeminfo/internal/model/SysteminfoInterface.java
diff --git a/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/binding/binding.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/binding/binding.xml
new file mode 100644
index 0000000000000..c90deb5d77b78
--- /dev/null
+++ b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/binding/binding.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<binding:binding id="systeminfo" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:binding="https://openhab.org/schemas/binding/v1.0.0"
+	xsi:schemaLocation="https://openhab.org/schemas/binding/v1.0.0 https://openhab.org/schemas/binding-1.0.0.xsd">
+
+	<name>Systeminfo Binding</name>
+	<description>This binding provides information about the operating system and the hardware.</description>
+	<author>Svilen Valkanov</author>
+
+</binding:binding>
diff --git a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/config/channelConfig.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/config/channelConfig.xml
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/ESH-INF/config/channelConfig.xml
rename to bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/config/channelConfig.xml
diff --git a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/config/computerConfig.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/config/computerConfig.xml
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/ESH-INF/config/computerConfig.xml
rename to bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/config/computerConfig.xml
diff --git a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/thing/channels.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/thing/channels.xml
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/ESH-INF/thing/channels.xml
rename to bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/thing/channels.xml
diff --git a/addons/binding/org.openhab.binding.systeminfo/ESH-INF/thing/computer.xml b/bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/thing/computer.xml
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo/ESH-INF/thing/computer.xml
rename to bundles/org.openhab.binding.systeminfo/src/main/resources/ESH-INF/thing/computer.xml
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 93936d4182858..187bda6a80b27 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -148,6 +148,7 @@
     <module>org.openhab.binding.spotify</module>
     <module>org.openhab.binding.squeezebox</module>
     <module>org.openhab.binding.synopanalyzer</module>
+    <module>org.openhab.binding.systeminfo</module>
     <module>org.openhab.binding.tado</module>
     <module>org.openhab.binding.tankerkoenig</module>
     <module>org.openhab.binding.tellstick</module>
diff --git a/features/karaf/openhab-addons/src/main/feature/feature.xml b/features/karaf/openhab-addons/src/main/feature/feature.xml
index 7dc7c4335858b..4bd2ec10a78fa 100644
--- a/features/karaf/openhab-addons/src/main/feature/feature.xml
+++ b/features/karaf/openhab-addons/src/main/feature/feature.xml
@@ -863,7 +863,10 @@
 
     <feature name="openhab-binding-systeminfo" description="System Info Binding" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <bundle start-level="80">mvn:org.openhab.binding/org.openhab.binding.systeminfo/${project.version}</bundle>
+        <bundle dependency="true">mvn:net.java.dev.jna/jna/5.3.0</bundle>
+        <bundle dependency="true">mvn:net.java.dev.jna/jna-platform/5.3.0</bundle>
+        <bundle dependency="true">mvn:com.github.oshi/oshi-core/3.13.0</bundle>
+        <bundle start-level="80">mvn:org.openhab.addons.bundles/org.openhab.binding.systeminfo/${project.version}</bundle>
     </feature>
 
     <feature name="openhab-binding-tado" description="Tado Binding" version="${project.version}">
diff --git a/itests/org.openhab.binding.systeminfo.tests/.classpath b/itests/org.openhab.binding.systeminfo.tests/.classpath
new file mode 100644
index 0000000000000..7c632d2631a3b
--- /dev/null
+++ b/itests/org.openhab.binding.systeminfo.tests/.classpath
@@ -0,0 +1,20 @@
+<?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="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/addons/binding/org.openhab.binding.systeminfo.test/.project b/itests/org.openhab.binding.systeminfo.tests/.project
similarity index 52%
rename from addons/binding/org.openhab.binding.systeminfo.test/.project
rename to itests/org.openhab.binding.systeminfo.tests/.project
index 93b63f92678bd..5ab19c92d9666 100644
--- a/addons/binding/org.openhab.binding.systeminfo.test/.project
+++ b/itests/org.openhab.binding.systeminfo.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.openhab.binding.systeminfo.test</name>
+	<name>org.openhab.binding.systeminfo.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -11,23 +11,13 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ds.core.builder</name>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/NOTICE b/itests/org.openhab.binding.systeminfo.tests/NOTICE
similarity index 100%
rename from addons/binding/org.openhab.binding.systeminfo.test/NOTICE
rename to itests/org.openhab.binding.systeminfo.tests/NOTICE
diff --git a/itests/org.openhab.binding.systeminfo.tests/itest.bndrun b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
new file mode 100644
index 0000000000000..55a0f3e077b07
--- /dev/null
+++ b/itests/org.openhab.binding.systeminfo.tests/itest.bndrun
@@ -0,0 +1,66 @@
+-include: ../itest-common.bndrun
+
+Bundle-SymbolicName: ${project.artifactId}
+Fragment-Host: org.openhab.binding.systeminfo
+
+-runrequires: \
+    bnd.identity;id='org.openhab.binding.systeminfo.tests',\
+    bnd.identity;id='org.openhab.core.binding.xml',\
+    bnd.identity;id='org.openhab.core.thing.xml'
+
+# We would like to use the "volatile" storage only
+-runblacklist: \
+    bnd.identity;id='org.openhab.core.storage.json',\
+    bnd.identity;id='org.openhab.core.storage.mapdb'
+
+-runsystemcapabilities: ${native_capability}
+#
+# done
+#
+-runbundles: \
+	com.google.gson;version='[2.8.2,2.8.3)',\
+	javax.measure.unit-api;version='[1.0.0,1.0.1)',\
+	org.apache.commons.collections;version='[3.2.1,3.2.2)',\
+	org.apache.commons.io;version='[2.2.0,2.2.1)',\
+	org.apache.commons.lang;version='[2.6.0,2.6.1)',\
+	org.apache.felix.configadmin;version='[1.9.8,1.9.9)',\
+	org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+	org.apache.felix.scr;version='[2.1.10,2.1.11)',\
+	org.eclipse.jetty.http;version='[9.4.11,9.4.12)',\
+	org.eclipse.jetty.io;version='[9.4.11,9.4.12)',\
+	org.eclipse.jetty.security;version='[9.4.11,9.4.12)',\
+	org.eclipse.jetty.server;version='[9.4.11,9.4.12)',\
+	org.eclipse.jetty.servlet;version='[9.4.11,9.4.12)',\
+	org.eclipse.jetty.util;version='[9.4.11,9.4.12)',\
+	org.openhab.binding.systeminfo;version='[2.5.0,2.5.1)',\
+	org.openhab.binding.systeminfo.tests;version='[2.5.0,2.5.1)',\
+	org.openhab.core;version='[2.5.0,2.5.1)',\
+	org.openhab.core.config.core;version='[2.5.0,2.5.1)',\
+	org.openhab.core.config.discovery;version='[2.5.0,2.5.1)',\
+	org.openhab.core.io.console;version='[2.5.0,2.5.1)',\
+	org.openhab.core.test;version='[2.5.0,2.5.1)',\
+	org.openhab.core.thing;version='[2.5.0,2.5.1)',\
+	org.osgi.service.event;version='[1.4.0,1.4.1)',\
+	osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
+	osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+	tec.uom.lib.uom-lib-common;version='[1.0.2,1.0.3)',\
+	tec.uom.se;version='[1.0.8,1.0.9)',\
+	org.apache.servicemix.bundles.xstream;version='[1.4.7,1.4.8)',\
+	org.openhab.core.binding.xml;version='[2.5.0,2.5.1)',\
+	org.openhab.core.config.xml;version='[2.5.0,2.5.1)',\
+	org.openhab.core.thing.xml;version='[2.5.0,2.5.1)',\
+	net.bytebuddy.byte-buddy;version='[1.9.7,1.9.8)',\
+	net.bytebuddy.byte-buddy-agent;version='[1.9.7,1.9.8)',\
+	org.apache.servicemix.specs.activation-api-1.1;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.annotation-api-1.3;version='[1.3.0,1.3.1)',\
+	org.apache.servicemix.specs.jaxb-api-2.2;version='[2.9.0,2.9.1)',\
+	org.apache.servicemix.specs.stax-api-1.2;version='[2.9.0,2.9.1)',\
+	org.mockito.mockito-core;version='[2.25.0,2.25.1)',\
+	org.objenesis;version='[2.6.0,2.6.1)',\
+	com.github.oshi.oshi-core;version='[3.13.0,3.13.1)',\
+	com.sun.jna;version='[5.3.0,5.3.1)',\
+	com.sun.jna.platform;version='[5.3.0,5.3.1)',\
+	org.eclipse.equinox.event;version='[1.4.300,1.4.301)',\
+	slf4j.api;version='[1.7.25,1.7.26)',\
+	ch.qos.logback.core;version='[1.2.3,1.2.4)',\
+	slf4j.simple;version='[1.7.21,1.7.22)'
\ No newline at end of file
diff --git a/itests/org.openhab.binding.systeminfo.tests/pom.xml b/itests/org.openhab.binding.systeminfo.tests/pom.xml
new file mode 100644
index 0000000000000..ef3847283e3a6
--- /dev/null
+++ b/itests/org.openhab.binding.systeminfo.tests/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.openhab.addons.itests</groupId>
+    <artifactId>org.openhab.addons.reactor.itests</artifactId>
+    <version>2.5.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>org.openhab.binding.systeminfo.tests</artifactId>
+
+  <name>openHAB Add-ons :: Integration Tests :: Systeminfo Binding Tests</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.openhab.addons.bundles</groupId>
+      <artifactId>org.openhab.binding.systeminfo</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna-platform</artifactId>
+      <version>5.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>net.java.dev.jna</groupId>
+      <artifactId>jna</artifactId>
+      <version>5.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.github.oshi</groupId>
+      <artifactId>oshi-core</artifactId>
+      <version>3.13.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/addons/binding/org.openhab.binding.systeminfo.test/src/test/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java b/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
similarity index 99%
rename from addons/binding/org.openhab.binding.systeminfo.test/src/test/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
rename to itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
index 9ee44765dae33..c8bd352320497 100644
--- a/addons/binding/org.openhab.binding.systeminfo.test/src/test/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
+++ b/itests/org.openhab.binding.systeminfo.tests/src/main/java/org/openhab/binding/systeminfo/test/SysteminfoOSGiTest.java
@@ -302,7 +302,7 @@ private void testInvalidConfiguration() {
                     is(equalTo(ThingStatus.OFFLINE)));
             assertThat(systemInfoThing.getStatusInfo().getStatusDetail(),
                     is(equalTo(ThingStatusDetail.HANDLER_INITIALIZING_ERROR)));
-            assertThat(systemInfoThing.getStatusInfo().getDescription(), is(equalTo("Thing can not be initialized!")));
+            assertThat(systemInfoThing.getStatusInfo().getDescription(), is(equalTo("Thing cannot be initialized!")));
         });
     }
 
diff --git a/itests/pom.xml b/itests/pom.xml
index 2b8d9b740debe..7ab187896bf00 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -26,6 +26,7 @@
     <module>org.openhab.binding.mqtt.homie.tests</module>
     <module>org.openhab.binding.nest.tests</module>
     <module>org.openhab.binding.ntp.tests</module>
+    <module>org.openhab.binding.systeminfo.tests</module>
     <module>org.openhab.binding.tradfri.tests</module>
     <module>org.openhab.binding.wemo.tests</module>
     <module>org.openhab.persistence.mapdb.tests</module>