diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index ae029e62297aa61a9ea5dee28222ce2865cbcb22..a9992f8a940212fd7ef68216e887a3f04d6699a1 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -433,6 +433,11 @@ mount_facet() {
             lctl set_param subsystem_debug=${SUBSYSTEM# }; \
             lctl set_param debug_mb=${DEBUG_SIZE}; \
             sync"
+ 
+        label=$(do_facet ${facet} "e2label ${!dev}")
+        [ -z "$label" ] && echo no label for ${!dev} && exit 1
+        eval export ${facet}_svc=${label}
+        echo Started ${label}
     fi
     return $RC
 }
@@ -448,12 +453,6 @@ start() {
     do_facet ${facet} mkdir -p ${MOUNT%/*}/${facet}
     mount_facet ${facet}
     RC=$?
-    if [ $RC -eq 0 ]; then
-        label=$(do_facet ${facet} "e2label ${device}")
-        [ -z "$label" ] && echo no label for ${device} && exit 1
-        eval export ${facet}_svc=${label}
-        echo Started ${label}
-    fi
     return $RC
 }