diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service
index 5a32a3e6..bba32b50 100755
--- a/services/presence/sugar-presence-service
+++ b/services/presence/sugar-presence-service
@@ -26,12 +26,6 @@ from sugar import env
 
 sys.path.insert(0, env.get_service_path('presence'))
 
-logger.start('presenceservice')
-
-import presenceservice
-
-logging.info('Starting presence service')
-
 test=0
 if len(sys.argv) > 1:
     try:
@@ -41,4 +35,13 @@ if len(sys.argv) > 1:
     if test < 1 or test > 10:
         logging.debug("Bad test user number.")
 
+if test > 0:
+    logger.start('test-%d-presenceservice' % test)
+else:
+    logger.start('presenceservice')
+
+import presenceservice
+
+logging.info('Starting presence service')
+
 presenceservice.main(test)