diff --git a/tests/cephfs/cephfs_nfs/nfs_info_cluster_id_and_ls_export_detailed.py b/tests/cephfs/cephfs_nfs/nfs_info_cluster_id_and_ls_export_detailed.py
index cf770f1ebc3..e391fb32a48 100644
--- a/tests/cephfs/cephfs_nfs/nfs_info_cluster_id_and_ls_export_detailed.py
+++ b/tests/cephfs/cephfs_nfs/nfs_info_cluster_id_and_ls_export_detailed.py
@@ -59,7 +59,7 @@ def run(ceph_cluster, **kw):
         bind = "/ceph"
         user_id = (
             f"nfs.{cluster_id}.{fs_name}"
-            if int(build.split(".")[0]) > 7
+            if int(build.split(".")[0]) == 7
             else f"nfs.{cluster_id}.{export_id}"
         )
 
diff --git a/tests/cephfs/cephfs_utilsV1.py b/tests/cephfs/cephfs_utilsV1.py
index 420e9ca347c..fbe9fc83da1 100644
--- a/tests/cephfs/cephfs_utilsV1.py
+++ b/tests/cephfs/cephfs_utilsV1.py
@@ -3390,6 +3390,8 @@ def validate_fs_services(self, client, service_name, is_present=True):
                 ):
                     raise CommandFailed(f"All {service_name} are Not UP")
                 return True
+            else:
+                raise CommandFailed(f"All {service_name} are still UP")
         except JSONDecodeError:
             if "No services reported" not in out:
                 raise CommandFailed(f"All Services are not down.. {out}")
diff --git a/tests/cephfs/clients/validate_root_squash.py b/tests/cephfs/clients/validate_root_squash.py
index 95c5f8dce3e..6db128faa42 100644
--- a/tests/cephfs/clients/validate_root_squash.py
+++ b/tests/cephfs/clients/validate_root_squash.py
@@ -192,7 +192,7 @@ def run(ceph_cluster, **kw):
                 fs_util,
                 clients[0],
                 fuse_mount_dir,
-                timeout=0,
+                timeout=300,
             )
             p.spawn(
                 start_io_time,
@@ -571,11 +571,13 @@ def run(ceph_cluster, **kw):
             stop_flag = True
             return 0
     except Exception as e:
+        global stop_flag
         stop_flag = True
         log.error(e)
         log.error(traceback.format_exc())
     finally:
         log.info("Cleanup In Progress")
+        global stop_flag
         stop_flag = True
         for cl in [client, client1]:
             log.info("Unmounting the mounts if created")