diff --git a/qa/workunits/rbd/cli_generic.sh b/qa/workunits/rbd/cli_generic.sh
index 46160c8059df..57279d26dcee 100755
--- a/qa/workunits/rbd/cli_generic.sh
+++ b/qa/workunits/rbd/cli_generic.sh
@@ -1503,13 +1503,15 @@ test_perf_image_iostat_recovery() {
     echo "testing recovery of perf handler after module's RADOS client is blocklisted..."
     remove_images
 
-    ceph osd pool create rbd1 8
-    rbd pool init rbd1
-    rbd namespace create rbd1/ns
+    ceph osd pool create rbd3 8
+    rbd pool init rbd3
+    rbd namespace create rbd3/ns
 
-    IMAGE_SPECS=("rbd1/test1" "rbd1/ns/test2")
+    IMAGE_SPECS=("rbd3/test1" "rbd3/ns/test2")
     for spec in "${IMAGE_SPECS[@]}"; do
-        rbd create $RBD_CREATE_ARGS --size 10G $spec
+        # ensure all images are created without a separate data pool
+        # as we filter iostat by specific pool specs below
+        rbd create $RBD_CREATE_ARGS --size 10G --rbd-default-data-pool '' $spec
     done
 
     BENCH_PIDS=()
@@ -1519,7 +1521,7 @@ test_perf_image_iostat_recovery() {
         BENCH_PIDS+=($!)
     done
 
-    test "$(rbd perf image iostat --format json rbd1 |
+    test "$(rbd perf image iostat --format json rbd3 |
         jq -r 'map(.image) | sort | join(" ")')" = 'test1'
 
     # Fetch and blocklist the rbd_support module's RADOS client
@@ -1529,10 +1531,10 @@ test_perf_image_iostat_recovery() {
     ceph osd blocklist add $CLIENT_ADDR
     ceph osd blocklist ls | grep $CLIENT_ADDR
 
-    expect_fail rbd perf image iostat --format json rbd1/ns
+    expect_fail rbd perf image iostat --format json rbd3/ns
     sleep 10
     for i in `seq 24`; do
-        test "$(rbd perf image iostat --format json rbd1/ns |
+        test "$(rbd perf image iostat --format json rbd3/ns |
             jq -r 'map(.image) | sort | join(" ")')" = 'test2' && break
 	sleep 10
     done
@@ -1543,7 +1545,7 @@ test_perf_image_iostat_recovery() {
     wait
 
     remove_images
-    ceph osd pool rm rbd1 rbd1 --yes-i-really-really-mean-it
+    ceph osd pool rm rbd3 rbd3 --yes-i-really-really-mean-it
 }
 
 test_mirror_pool_peer_bootstrap_create() {
@@ -1661,7 +1663,6 @@ test_tasks_recovery() {
     ceph osd blocklist add $CLIENT_ADDR
     ceph osd blocklist ls | grep $CLIENT_ADDR
 
-    test "$(ceph rbd task list)" = "[]"
     expect_fail ceph rbd task add flatten rbd2/clone1
     sleep 10
     for i in `seq 24`; do
@@ -1670,10 +1671,6 @@ test_tasks_recovery() {
     done
     test "$(ceph rbd task list)" != "[]"
 
-    # queue flatten and check that it completes
-    rbd info rbd2/clone1 | grep 'parent: '
-    expect_fail rbd snap unprotect rbd2/img1@snap
-    ceph rbd task add flatten rbd2/clone1
     for i in {1..12}; do
         rbd info rbd2/clone1 | grep 'parent: ' || break
         sleep 10