diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/testfiles/Profile.cfg b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/testfiles/Profile.cfg
index 8b93372b67..7245c334ed 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/testfiles/Profile.cfg
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.swtbot.tests/testfiles/Profile.cfg
@@ -78,7 +78,7 @@ lttng --mi xml list
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/eedbhu/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output></command>
+<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/user/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output></command>
 </COMMAND_OUTPUT>
 <COMMAND_INPUT>
 lttng --mi xml list ${sessionname}
@@ -88,7 +88,7 @@ lttng --mi xml list ${sessionname}
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/eedbhu/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval><domains><domain><type>KERNEL</type><buffer_type>GLOBAL</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>200000</read_timer_interval><output_type>SPLICE</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>SYSCALL</type><enabled>true</enabled><filter>false</filter></event><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><loglevel>TRACE_EMERG</loglevel><loglevel_type>ALL</loglevel_type><exclusion>false</exclusion></event></events></channel></channels></domain><domain><type>UST</type><buffer_type>PER_UID</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>0</read_timer_interval><output_type>MMAP</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><exclusion>false</exclusion></event></events></channel></channels></domain></domains></session></sessions></output></command>
+<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/user/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval><domains><domain><type>KERNEL</type><buffer_type>GLOBAL</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>200000</read_timer_interval><output_type>SPLICE</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>SYSCALL</type><enabled>true</enabled><filter>false</filter></event><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><loglevel>TRACE_EMERG</loglevel><loglevel_type>ALL</loglevel_type><exclusion>false</exclusion></event></events></channel></channels></domain><domain><type>UST</type><buffer_type>PER_UID</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>0</read_timer_interval><output_type>MMAP</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><exclusion>false</exclusion></event></events></channel></channels></domain></domains></session></sessions></output></command>
 </COMMAND_OUTPUT>
 </SCENARIO>
 <SCENARIO>
@@ -119,7 +119,7 @@ lttng --mi xml load -i ${userhome}/.lttng/sessions/${sessionname}.lttng -f
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>load</name><output><load><session><name>*</name></session><path>/home/eedbhu/.lttng/sessions/${sessionname}.lttng</path></load></output><success>true</success></command>
+<command><name>load</name><output><load><session><name>*</name></session><path>/home/user/.lttng/sessions/${sessionname}.lttng</path></load></output><success>true</success></command>
 </COMMAND_OUTPUT>
 <COMMAND_INPUT>
 lttng --mi xml list -k
@@ -189,7 +189,7 @@ lttng --mi xml list
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/eedbhu/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output></command>
+<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/user/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output></command>
 </COMMAND_OUTPUT>
 <COMMAND_INPUT>
 lttng --mi xml list ${sessionname}
@@ -199,7 +199,7 @@ lttng --mi xml list ${sessionname}
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/eedbhu/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval><domains><domain><type>KERNEL</type><buffer_type>GLOBAL</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>200000</read_timer_interval><output_type>SPLICE</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><loglevel>TRACE_EMERG</loglevel><loglevel_type>ALL</loglevel_type><exclusion>false</exclusion></event><event><name>*</name><type>SYSCALL</type><enabled>true</enabled><filter>false</filter></event></events></channel></channels></domain><domain><type>UST</type><buffer_type>PER_UID</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>0</read_timer_interval><output_type>MMAP</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><exclusion>false</exclusion></event></events></channel></channels></domain></domains></session></sessions></output></command>
+<command><name>list</name><output><sessions><session><name>${sessionname}</name><path>/home/user/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval><domains><domain><type>KERNEL</type><buffer_type>GLOBAL</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>200000</read_timer_interval><output_type>SPLICE</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><loglevel>TRACE_EMERG</loglevel><loglevel_type>ALL</loglevel_type><exclusion>false</exclusion></event><event><name>*</name><type>SYSCALL</type><enabled>true</enabled><filter>false</filter></event></events></channel></channels></domain><domain><type>UST</type><buffer_type>PER_UID</buffer_type><trackers/><channels><channel><name>channel0</name><enabled>true</enabled><attributes><overwrite_mode>DISCARD</overwrite_mode><subbuffer_size>8388608</subbuffer_size><subbuffer_count>4</subbuffer_count><switch_timer_interval>0</switch_timer_interval><read_timer_interval>0</read_timer_interval><output_type>MMAP</output_type><tracefile_size>0</tracefile_size><tracefile_count>0</tracefile_count><live_timer_interval>0</live_timer_interval></attributes><events><event><name>*</name><type>TRACEPOINT</type><enabled>true</enabled><filter>false</filter><exclusion>false</exclusion></event></events></channel></channels></domain></domains></session></sessions></output></command>
 </COMMAND_OUTPUT>
 <COMMAND_INPUT>
 lttng --mi xml start ${sessionname}
@@ -229,6 +229,6 @@ lttng --mi xml destroy ${sessionname}
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 <?xml version="1.0" encoding="UTF-8"?>
-<command><name>destroy</name><output><sessions><session><name>${sessionname}</name><path>/home/eedbhu/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output><success>true</success></command>
+<command><name>destroy</name><output><sessions><session><name>${sessionname}</name><path>/home/user/lttng-traces/${sessionname}-20151203-134849</path><enabled>false</enabled><snapshot_mode>0</snapshot_mode><live_timer_interval>0</live_timer_interval></session></sessions></output><success>true</success></command>
 </COMMAND_OUTPUT>
 </SCENARIO>
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg
index cc9a1f2d71..4cef29a115 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/CreateTreeTest.cfg
@@ -1371,7 +1371,7 @@ lttng list
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
 Available tracing sessions:
-  1) mysession (/home/eedbhu/lttng-traces/mysession-20120321-115617) [inactive]
+  1) mysession (/home/user/lttng-traces/mysession-20120321-115617) [inactive]
 
 Use lttng list <session_name> for more details
 </COMMAND_OUTPUT>
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
index 36c5efe632..baf86d496b 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui.tests/testfiles/LTTngServiceTest.cfg
@@ -757,9 +757,9 @@ lttng -vvv destroy mysession2
 0
 </COMMAND_RESULT>
 <COMMAND_OUTPUT>
-DEBUG2: Config file path found: /home/eedbhu [in get_session_name() at utils.c:98]
+DEBUG2: Config file path found: /home/user [in get_session_name() at utils.c:98]
 DEBUG1: Session name found: mysession2 [in get_session_name() at utils.c:99]
-Session mysession2 destroyed at /home/eedbhu
+Session mysession2 destroyed at /home/user
 </COMMAND_OUTPUT>
 </SCENARIO>
 
diff --git a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
index 576ab896dc..de597a45a2 100644
--- a/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
+++ b/lttng/org.eclipse.tracecompass.lttng2.control.ui/src/org/eclipse/tracecompass/internal/lttng2/control/ui/views/service/LTTngControlService.java
@@ -209,12 +209,12 @@ public ISessionInfo getSession(String sessionName, IProgressMonitor monitor) thr
 
         // Output:
         // Tracing session mysession2: [inactive]
-        // Trace path: /home/eedbhu/lttng-traces/mysession2-20120123-110330
+        // Trace path: /home/user/lttng-traces/mysession2-20120123-110330
         ISessionInfo sessionInfo = new SessionInfo(sessionName);
 
         while (index < result.getOutput().size()) {
             // Tracing session mysession2: [inactive]
-            // Trace path: /home/eedbhu/lttng-traces/mysession2-20120123-110330
+            // Trace path: /home/user/lttng-traces/mysession2-20120123-110330
             //
             // === Domain: Kernel ===
             //