diff --git a/qa/suites/fs/workload/begin/.qa b/qa/suites/fs/workload/begin/.qa
index fea2489fdf6d9..a602a0353e751 120000
--- a/qa/suites/fs/workload/begin/.qa
+++ b/qa/suites/fs/workload/begin/.qa
@@ -1 +1 @@
-../.qa
\ No newline at end of file
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/mount b/qa/suites/fs/workload/mount
deleted file mode 120000
index e3600f453f2f3..0000000000000
--- a/qa/suites/fs/workload/mount
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/ms_mode/.qa b/qa/suites/fs/workload/mount/.qa
similarity index 100%
rename from qa/suites/fs/workload/ms_mode/.qa
rename to qa/suites/fs/workload/mount/.qa
diff --git a/qa/suites/fs/workload/mount/fuse.yaml b/qa/suites/fs/workload/mount/fuse.yaml
new file mode 120000
index 0000000000000..0e55da9fb7ab9
--- /dev/null
+++ b/qa/suites/fs/workload/mount/fuse.yaml
@@ -0,0 +1 @@
+.qa/cephfs/mount/fuse.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/workload/mount/kclient/% b/qa/suites/fs/workload/mount/kclient/%
new file mode 100644
index 0000000000000..b8626c4cff284
--- /dev/null
+++ b/qa/suites/fs/workload/mount/kclient/%
@@ -0,0 +1 @@
+4
diff --git a/qa/suites/fs/workload/wsync/.qa b/qa/suites/fs/workload/mount/kclient/.qa
similarity index 100%
rename from qa/suites/fs/workload/wsync/.qa
rename to qa/suites/fs/workload/mount/kclient/.qa
diff --git a/qa/suites/fs/workload/mount/kclient/base b/qa/suites/fs/workload/mount/kclient/base
new file mode 120000
index 0000000000000..22f94e1509bc8
--- /dev/null
+++ b/qa/suites/fs/workload/mount/kclient/base
@@ -0,0 +1 @@
+.qa/cephfs/mount/kclient/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/mount/kclient/ms_mode/.qa b/qa/suites/fs/workload/mount/kclient/ms_mode/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/workload/mount/kclient/ms_mode/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/ms_mode/crc.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/crc.yaml
similarity index 100%
rename from qa/suites/fs/workload/ms_mode/crc.yaml
rename to qa/suites/fs/workload/mount/kclient/ms_mode/crc.yaml
diff --git a/qa/suites/fs/workload/ms_mode/legacy.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/legacy.yaml
similarity index 100%
rename from qa/suites/fs/workload/ms_mode/legacy.yaml
rename to qa/suites/fs/workload/mount/kclient/ms_mode/legacy.yaml
diff --git a/qa/suites/fs/workload/ms_mode/secure.yaml b/qa/suites/fs/workload/mount/kclient/ms_mode/secure.yaml
similarity index 100%
rename from qa/suites/fs/workload/ms_mode/secure.yaml
rename to qa/suites/fs/workload/mount/kclient/ms_mode/secure.yaml
diff --git a/qa/suites/fs/workload/mount/kclient/wsync/.qa b/qa/suites/fs/workload/mount/kclient/wsync/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/fs/workload/mount/kclient/wsync/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/workload/wsync/no.yaml b/qa/suites/fs/workload/mount/kclient/wsync/no.yaml
similarity index 100%
rename from qa/suites/fs/workload/wsync/no.yaml
rename to qa/suites/fs/workload/mount/kclient/wsync/no.yaml
diff --git a/qa/suites/fs/workload/wsync/yes.yaml b/qa/suites/fs/workload/mount/kclient/wsync/yes.yaml
similarity index 100%
rename from qa/suites/fs/workload/wsync/yes.yaml
rename to qa/suites/fs/workload/mount/kclient/wsync/yes.yaml
diff --git a/qa/suites/fs/workload/ms_mode/$ b/qa/suites/fs/workload/ms_mode/$
deleted file mode 100644
index e69de29bb2d1d..0000000000000
diff --git a/qa/suites/fs/workload/wsync/$ b/qa/suites/fs/workload/wsync/$
deleted file mode 100644
index e69de29bb2d1d..0000000000000