diff --git a/LCS/Messaging/python/messaging/__init__.py b/LCS/Messaging/python/messaging/__init__.py
index 295c9c0f37adf1e3d58c64f46b5321f1a3e49313..977feb2d3961fa958c331dc29339964f5e10869a 100644
--- a/LCS/Messaging/python/messaging/__init__.py
+++ b/LCS/Messaging/python/messaging/__init__.py
@@ -30,8 +30,13 @@ from messagebus import *
 from RPC import *
 from Service import *
 import logging
+import os
 
 def setQpidLogLevel(qpidLogLevel):
     for name, logger in logging.Logger.manager.loggerDict.items():
         if name.startswith('qpid.') and isinstance(logger, logging.Logger):
             logger.setLevel(qpidLogLevel)
+
+def adaptNameToEnvironment(name):
+    if os.environ.get('LOFARENV', 'test') != 'PRODUCTION':
+        return 'test.%s' % name
diff --git a/SAS/MoM/MoMQueryService/config.py b/SAS/MoM/MoMQueryService/config.py
index ebd3d6287dd1c5fd37a8dd0de7a6968d67820e7a..e846acfbd04c3411d2117538c4859461d99c6f22 100644
--- a/SAS/MoM/MoMQueryService/config.py
+++ b/SAS/MoM/MoMQueryService/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'momqueryservice'
diff --git a/SAS/OTDB_Services/config.py b/SAS/OTDB_Services/config.py
index 4058c16d940f986782f9ef70a4ca58177fa0b35e..f07712fe5bed5fa5e60c28d4c7c2eaa1b9a1e64a 100644
--- a/SAS/OTDB_Services/config.py
+++ b/SAS/OTDB_Services/config.py
@@ -1,8 +1,10 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_OTDB_SERVICE_BUSNAME = 'lofar.otdb.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_OTDB_SERVICE_BUSNAME = adaptNameToEnvironment('lofar.otdb.command')
 DEFAULT_OTDB_SERVICENAME = 'OTDBService'
 
-DEFAULT_OTDB_NOTIFICATION_BUSNAME='lofar.otdb.notification'
+DEFAULT_OTDB_NOTIFICATION_BUSNAME= adaptNameToEnvironment('lofar.otdb.notification')
 DEFAULT_OTDB_NOTIFICATION_SUBJECT='TaskStatus'
diff --git a/SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py b/SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py
index f5c2f48dc010af2e4cc0c23ff93b8b7b03932b92..f4e51446a1bfd57cfaed8c07ec2b81f8d14ee982 100644
--- a/SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py
+++ b/SAS/ResourceAssignment/RATaskSpecifiedService/lib/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME='lofar.ra.notification'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_BUSNAME=adaptNameToEnvironment('lofar.ra.notification')
 DEFAULT_RA_TASK_SPECIFIED_NOTIFICATION_SUBJECT='RA.TaskSpecified'
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
index e72bb94ab0897aade3307504f1e2a809ec841e1f..c0edd83ff5db40e4bd2d4091026c8be5c52d5056 100644
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/config.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 # $Id$
 
-#DEFAULT_BUSNAME = 'lofar.ra.command'
-#DEFAULT_SERVICENAME = 'RAtoORTBTaskSpecificationPropagationService'
+from lofar.messaging import adaptNameToEnvironment
+
 
diff --git a/SAS/ResourceAssignment/ResourceAssigner/lib/config.py b/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
index d69a4adc1795ad1e118b0d1cf7d02ddabf592902..24a16cad21b25421a2e0bfc042b22ecd1821ed03 100644
--- a/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
+++ b/SAS/ResourceAssignment/ResourceAssigner/lib/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'RAService'
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py
index dabf0b2a3750874a7bf3199675def744ea418f4c..32eb95de108d16c66160700716d18c5236a612d9 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/config.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_NOTIFICATION_BUSNAME = 'lofar.ra.notification'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_NOTIFICATION_BUSNAME = adaptNameToEnvironment('lofar.ra.notification')
 DEFAULT_NOTIFICATION_PREFIX = 'RADB.'
 DEFAULT_NOTIFICATION_SUBJECTS=DEFAULT_NOTIFICATION_PREFIX+'*'
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEstimator/config.py b/SAS/ResourceAssignment/ResourceAssignmentEstimator/config.py
index fa39d8db77108f72fd79859b4665776a6dcf4c4a..ea75640ff6ea0c13d9d47cc979f308f769f824e7 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEstimator/config.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEstimator/config.py
@@ -1,6 +1,8 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'ResourceEstimation'
 
diff --git a/SAS/ResourceAssignment/ResourceAssignmentService/config.py b/SAS/ResourceAssignment/ResourceAssignmentService/config.py
index 7df309d54ff136520b684637c461cad026a436ba..5798e1e9417e68d4239aa572ea98ed6e04e33ead 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentService/config.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentService/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_BUSNAME = 'lofar.ra.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_BUSNAME = adaptNameToEnvironment('lofar.ra.command')
 DEFAULT_SERVICENAME = 'RADBService'
diff --git a/SAS/ResourceAssignment/SystemStatusService/config.py b/SAS/ResourceAssignment/SystemStatusService/config.py
index 1ea6c29b457c0119660590f1bf761c49ce9d92cf..115bee8cc0ea72f9b35f0b02c3ec0ed8e56b9635 100644
--- a/SAS/ResourceAssignment/SystemStatusService/config.py
+++ b/SAS/ResourceAssignment/SystemStatusService/config.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 # $Id$
 
-DEFAULT_SSDB_BUSNAME = 'lofar.ssdb.command'
+from lofar.messaging import adaptNameToEnvironment
+
+DEFAULT_SSDB_BUSNAME = adaptNameToEnvironment('lofar.ssdb.command')
 DEFAULT_SSDB_SERVICENAME = 'SSDBService'