diff --git a/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_configuration.py b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_configuration.py
new file mode 100644
index 0000000000000000000000000000000000000000..52f469b8a0ff185fc1451bab541fe490dcaf2f1c
--- /dev/null
+++ b/tangostationcontrol/tangostationcontrol/integration_test/default/devices/test_device_configuration.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of the LOFAR 2.0 Station Software
+#
+#
+#
+# Distributed under the terms of the APACHE license.
+# See LICENSE.txt for more info.
+
+from tango import DevState
+
+from .base import AbstractTestBases
+
+import json
+
+class TestDeviceConfiguration(AbstractTestBases.TestDeviceBase):
+
+    def setUp(self):
+        super().setUp("STAT/Configuration/1")
+    
+    def test_read_tangodb_properties(self):
+        self.proxy.warm_boot()
+        self.assertEqual(DevState.ON, self.proxy.state())
+        """ Test whether the station control configuration is correctly retrieved as a JSON string """
+        tangodb_properties = self.proxy.tangodb_properties_RW
+        dbdata = json.loads(tangodb_properties)
+        self.assertTrue(type(dbdata), dict)
+        self.assertGreater(len(dbdata['servers']), 0)
+        # Verify if Configuration Device exists
+        self.assertTrue('configuration' in dbdata['servers']) # server-name
+        self.assertTrue('stat' in dbdata['servers']['configuration']) # server-instance
+        self.assertTrue('configuration' in dbdata['servers']['configuration']['stat']) # server-class
+        self.assertTrue('stat/configuration/1' in dbdata['servers']['configuration']['stat']['configuration']) # device
diff --git a/tangostationcontrol/tangostationcontrol/test/devices/test_configuration_device.py b/tangostationcontrol/tangostationcontrol/test/devices/test_configuration_device.py
deleted file mode 100644
index 809a99a92308cc44c20fb970e027f2d7ee123dc5..0000000000000000000000000000000000000000
--- a/tangostationcontrol/tangostationcontrol/test/devices/test_configuration_device.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# This file is part of the LOFAR 2.0 Station Software
-#
-#
-#
-# Distributed under the terms of the APACHE license.
-# See LICENSE.txt for more info.
-
-from tango import DevState
-from tango.test_context import DeviceTestContext
-
-from tangostationcontrol.devices import configuration_device
-from tangostationcontrol.test import base
-
-import json
-
-class TestConfigurationDevice(base.TestCase):
-
-    def setUp(self):
-        super(TestConfigurationDevice, self).setUp()
-
-    def test_read_tangodb_properties(self):
-        with DeviceTestContext(configuration_device.Configuration, properties={}, process=True) as proxy:
-            proxy.warm_boot()
-            self.assertEqual(DevState.ON, proxy.state())
-            """ Test whether the station control configuration is correctly retrieved as a JSON string """
-            tangodb_properties = self.proxy.tangodb_properties_RW
-            dbdata = json.loads(tangodb_properties)
-            self.assertTrue(type(dbdata), dict)
-            self.assertGreater(len(dbdata['servers']), 0)
-            # Verify if Configuration Device exists
-            self.assertTrue('configuration' in dbdata['servers']) # server-name
-            self.assertTrue('stat' in dbdata['servers']['configuration']) # server-instance
-            self.assertTrue('configuration' in dbdata['servers']['configuration']['stat']) # server-class
-            self.assertTrue('stat/configuration/1' in dbdata['servers']['configuration']['stat']['configuration']) # device