diff --git a/libs/locallibs/get_test_device.py b/libs/locallibs/get_test_device.py
index 01fc4942a0845b47a15247c13204af85a83bcbbc..524462875283aafdcf375315bca1c13b7c737dda 100644
--- a/libs/locallibs/get_test_device.py
+++ b/libs/locallibs/get_test_device.py
@@ -107,11 +107,11 @@ def get_test_disk(node=1):
     """
     if os.environ.get("NODE" + str(node) + "LOCALTION") == "local":
         used_disk = subprocess.getoutput(
-            "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | tr -d '[0-9]' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'"
+            "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | sed 's/[0-9]\+$//' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'"
         )
 
         test_disk = subprocess.getoutput(
-            "lsblk -n | grep 'disk' | grep -v '└─.*\|"
+            "lsblk -n | grep 'disk' | grep -v '└─.*\|├─.*\|"
             + used_disk.replace(" ", "\|")
             + "' | awk '{print $1}' | sed -e ':a;N;$!ba;s/\\n/ /g'"
         )
@@ -124,11 +124,11 @@ def get_test_disk(node=1):
         )
         used_disk = ssh_cmd.pssh_cmd(
             conn,
-            "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | tr -d '[0-9]' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'",
+            "lsblk -l | grep -e '/.*\|\[.*\]' | awk '{print $1}' | sed 's/[0-9]\+$//' | uniq | sed -e ':a;N;$!ba;s/\\n/ /g'",
         )[1]
         test_disk = ssh_cmd.pssh_cmd(
             conn,
-            "lsblk -n | grep 'disk' | grep -v '└─.*\|"
+            "lsblk -n | grep 'disk' | grep -v '└─.*\|├─.*\|"
             + used_disk.replace(" ", "\|")
             + "' | awk '{print $1}' | sed -e ':a;N;$!ba;s/\\n/ /g'",
         )[1]