diff --git a/ocs_ci/templates/workloads/fio/benchmark_fio.yaml b/ocs_ci/templates/workloads/fio/benchmark_fio.yaml
index a25c7484d37..7816b8acbdd 100644
--- a/ocs_ci/templates/workloads/fio/benchmark_fio.yaml
+++ b/ocs_ci/templates/workloads/fio/benchmark_fio.yaml
@@ -22,7 +22,7 @@ spec:
         - 16KiB
         - 4KiB
       numjobs:
-        - 1
+        - 2
       iodepth: 16
       read_runtime: 300
       write_runtime: 300
@@ -32,7 +32,7 @@ spec:
       log_sample_rate: 10000
       storageclass: ocs-storagecluster-ceph-rbd
       storagesize: 12Gi
-      job_timeout: 18000
+      job_timeout: 30000
 #      rook_ceph_drop_caches: True
 #      rook_ceph_drop_cache_pod_ip:
 #######################################
diff --git a/ocs_ci/templates/workloads/fio/benchmark_fio_cmp.yaml b/ocs_ci/templates/workloads/fio/benchmark_fio_cmp.yaml
index 6ec0c9fff52..305d1ad9ce7 100644
--- a/ocs_ci/templates/workloads/fio/benchmark_fio_cmp.yaml
+++ b/ocs_ci/templates/workloads/fio/benchmark_fio_cmp.yaml
@@ -20,7 +20,7 @@ spec:
       bs:
         - 64KiB
       numjobs:
-        - 1
+        - 2
       iodepth: 16
       read_runtime: 300
       write_runtime: 300
@@ -31,7 +31,7 @@ spec:
       storageclass: ocs-storagecluster-ceph-rbd-cmp
       storagesize: 12Gi
       cmp_ratio: 75
-      job_timeout: 36000
+      job_timeout: 30000
 #      rook_ceph_drop_caches: True
 #      rook_ceph_drop_cache_pod_ip:
 #######################################
diff --git a/tests/cross_functional/performance/io_workload/test_fio_benchmark.py b/tests/cross_functional/performance/io_workload/test_fio_benchmark.py
index 38516ee5bb1..5d8a49427cb 100644
--- a/tests/cross_functional/performance/io_workload/test_fio_benchmark.py
+++ b/tests/cross_functional/performance/io_workload/test_fio_benchmark.py
@@ -194,7 +194,7 @@ def setting_storage_usage(self):
         log.info("Setting prefill value to False ")
         self.crd_data["spec"]["workload"]["args"]["prefill"] = False
 
-    def setting_io_pattern(self, io_pattern):
+    def setting_io_pattern(self, io_pattern, op):
         """
         Setting the test jobs according to the io pattern - random / sequential
 
@@ -203,12 +203,9 @@ def setting_io_pattern(self, io_pattern):
 
         """
         if io_pattern == "sequential":
-            self.crd_data["spec"]["workload"]["args"]["jobs"] = ["write", "read"]
+            self.crd_data["spec"]["workload"]["args"]["jobs"] = [op]
         if io_pattern == "random":
-            self.crd_data["spec"]["workload"]["args"]["jobs"] = [
-                "randwrite",
-                "randread",
-            ]
+            self.crd_data["spec"]["workload"]["args"]["jobs"] = [op]
 
     def init_full_results(self, full_results):
         """
@@ -378,27 +375,43 @@ def setup_internal_es(self):
                     self.es = None
 
     @pytest.mark.parametrize(
-        argnames=["interface", "io_pattern"],
+        argnames=["interface", "io_pattern", "op"],
         argvalues=[
             pytest.param(
-                *[constants.CEPHBLOCKPOOL, "sequential"],
-                marks=pytest.mark.polarion_id("OCS-844"),
+                *[constants.CEPHFILESYSTEM, "random", "randread"],
+                marks=pytest.mark.polarion_id("OCS-846"),
+            ),
+            pytest.param(
+                *[constants.CEPHFILESYSTEM, "random", "randwrite"],
+                marks=pytest.mark.polarion_id("OCS-847"),
             ),
             pytest.param(
-                *[constants.CEPHFILESYSTEM, "sequential"],
-                marks=pytest.mark.polarion_id("OCS-845"),
+                *[constants.CEPHBLOCKPOOL, "random", "randwrite"],
+                marks=pytest.mark.polarion_id("OCS-846"),
+            ),
+            pytest.param(
+                *[constants.CEPHBLOCKPOOL, "random", "randread"],
+                marks=pytest.mark.polarion_id("OCS-847"),
             ),
             pytest.param(
-                *[constants.CEPHBLOCKPOOL, "random"],
+                *[constants.CEPHFILESYSTEM, "sequential", "read"],
                 marks=pytest.mark.polarion_id("OCS-846"),
             ),
             pytest.param(
-                *[constants.CEPHFILESYSTEM, "random"],
+                *[constants.CEPHBLOCKPOOL, "sequential", "write"],
+                marks=pytest.mark.polarion_id("OCS-847"),
+            ),
+            pytest.param(
+                *[constants.CEPHBLOCKPOOL, "sequential", "read"],
+                marks=pytest.mark.polarion_id("OCS-846"),
+            ),
+            pytest.param(
+                *[constants.CEPHFILESYSTEM, "sequential", "write"],
                 marks=pytest.mark.polarion_id("OCS-847"),
             ),
         ],
     )
-    def test_fio_workload_simple(self, interface, io_pattern):
+    def test_fio_workload_simple(self, interface, io_pattern, op):
         """
         This is a basic fio perf test - non-compressed volumes
 
@@ -437,7 +450,7 @@ def test_fio_workload_simple(self, interface, io_pattern):
 
         self.get_env_info()
 
-        self.setting_io_pattern(io_pattern)
+        self.setting_io_pattern(io_pattern, op)
 
         self.run()