diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore
new file mode 100644
index 00000000000..b878e882aca
--- /dev/null
+++ b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml
deleted file mode 100644
index f5350c0dff6..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.DumbThingTypeProvider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml
deleted file mode 100644
index 2ecfa621d40..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueChannelTypeProvider.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml
deleted file mode 100644
index 443104a73ff..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueConfigDescriptionProvider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml
deleted file mode 100644
index ca66a690afb..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingHandlerFactory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml b/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml
deleted file mode 100644
index 754a64d3f65..00000000000
--- a/bundles/model/org.eclipse.smarthome.model.thing.tests/OSGI-INF/org.eclipse.smarthome.model.thing.test.hue.TestHueThingTypeProvider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/bundles/pom.xml b/bundles/pom.xml
index 47492c4816e..573f4ef66ea 100644
--- a/bundles/pom.xml
+++ b/bundles/pom.xml
@@ -62,6 +62,27 @@
+
+ maven-resources-plugin
+ 3.1.0
+
+
+
+ copy-resources
+
+ process-test-resources
+
+ ${project.basedir}/OSGI-INF
+ true
+
+
+ ${project.basedir}/target/classes/OSGI-INF
+
+
+
+
+
+
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore
new file mode 100644
index 00000000000..b878e882aca
--- /dev/null
+++ b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/.gitignore
@@ -0,0 +1 @@
+/*.xml
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml
deleted file mode 100644
index 09018538bab..00000000000
--- a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/OSGI-INF/binding.dmx.test.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
index 7698959591a..7960bc0db82 100644
--- a/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
+++ b/extensions/binding/org.eclipse.smarthome.binding.dmx.test/src/test/java/org/eclipse/smarthome/binding/dmx/test/DmxTestHandlerFactory.java
@@ -26,7 +26,7 @@
*
* @author Jan N. Klug - Initial contribution
*/
-@Component(service = ThingHandlerFactory.class, immediate = true, name = "binding.dmx.test")
+@Component(service = ThingHandlerFactory.class)
public class DmxTestHandlerFactory extends BaseThingHandlerFactory {
@Override
diff --git a/extensions/pom.xml b/extensions/pom.xml
index e1c99c82241..c6d613bb582 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -60,6 +60,27 @@
+
+ maven-resources-plugin
+ 3.1.0
+
+
+
+ copy-resources
+
+ process-test-resources
+
+ ${project.basedir}/OSGI-INF
+ true
+
+
+ ${project.basedir}/target/classes/OSGI-INF
+
+
+
+
+
+
diff --git a/pom.xml b/pom.xml
index 76d7afa2d9b..51e1616222a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -176,6 +176,7 @@
eclipse-plugin
+ eclipse-test-plugin