diff --git a/tangostationcontrol/tangostationcontrol/test/common/test_configuration.py b/tangostationcontrol/tangostationcontrol/test/common/test_configuration.py
index b5a5016f7a1fde43be1fbd25fe8099c0d3175499..91dd665428d6e8e33c1fd6585a439bcdb854eaa5 100644
--- a/tangostationcontrol/tangostationcontrol/test/common/test_configuration.py
+++ b/tangostationcontrol/tangostationcontrol/test/common/test_configuration.py
@@ -7,11 +7,16 @@
 # Distributed under the terms of the APACHE license.
 # See LICENSE.txt for more info.
 
-from tangostationcontrol.common.configuration import query_to_tuples, add_to_devices_dict, add_to_attrs_dict, add_to_server_dict
+from tango import Database
+
+from tangostationcontrol.common.configuration import StationConfiguration
 
 from tangostationcontrol.test import base
 
 class TestDbDataConversion(base.TestCase):
+
+    sc = StationConfiguration(Database())
+
     def test_query_to_tuples(self):
         """ Test whether Tango DB data are correctly converted into tuples """
         raw_result = ['device1', 'property_name1', 'value1', 'device1', 'property_name2', 'value2']
@@ -19,14 +24,14 @@ class TestDbDataConversion(base.TestCase):
         record1 = ('device1', 'property_name1', 'value1')
         record2 = ('device1', 'property_name2', 'value2')
         expected_result = [record1, record2]
-        self.assertEqual(query_to_tuples(raw_result, num_col), expected_result)
+        self.assertEqual(self.sc.query_to_tuples(raw_result, num_col), expected_result)
     
     def test_add_to_devices_dict(self):
         """ Test whether data retrieved from DB are correctly inserted into devices dictionary """
         data = [('device1', 'property_name1', 'value1'), ('device1', 'property_name2', 'value2')]
         expected_result = {'device1': {'properties': {  'property_name1': ['value1'],
                                                         'property_name2': ['value2']}}}
-        self.assertEqual(add_to_devices_dict({}, data), expected_result)
+        self.assertEqual(self.sc.add_to_devices_dict({}, data), expected_result)
 
     def test_add_to_attrs_dict(self):
         """ Test whether data retrieved from DB are correctly inserted into attributes dictionary """
@@ -35,13 +40,13 @@ class TestDbDataConversion(base.TestCase):
                 ('device1', 'attribute2', 'attr_property_name1', 'value2')]
         expected_result = {'device1': {'attribute_properties': {'attribute1': {'attr_property_name1': ['value1']},
                                                                 'attribute2': {'attr_property_name1': ['value2']}}}}
-        self.assertEqual(add_to_attrs_dict({}, data_2attrs), expected_result)
+        self.assertEqual(self.sc.add_to_attrs_dict({}, data_2attrs), expected_result)
         # One attribute, two property values
         data_1attr = [('device1', 'attribute1', 'attr_property_name1', 'value1'), 
                 ('device1', 'attribute1', 'attr_property_name1', 'value2')]
         expected_result = {'device1': {'attribute_properties': {'attribute1': 
                                         {'attr_property_name1': ['value1','value2']}}}}
-        self.assertEqual(add_to_attrs_dict({}, data_1attr), expected_result)
+        self.assertEqual(self.sc.add_to_attrs_dict({}, data_1attr), expected_result)
     
     def test_add_to_server_dict(self):
         """ Test whether data retrieved from DB are correctly inserted into server dictionary """
@@ -51,4 +56,4 @@ class TestDbDataConversion(base.TestCase):
         expected_result = {'server_name': {'server_instance': {'server_class': 
                             {'device1': {'properties': {'property_name1': ['value1'],
                                                         'property_name2': ['value2']}}}}}}
-        self.assertEqual(add_to_server_dict({}, devices_dict, data), expected_result)
+        self.assertEqual(self.sc.add_to_server_dict({}, devices_dict, data), expected_result)