diff --git a/test/blobfs/blobfs.sh b/test/blobfs/blobfs.sh
index a741eca37..46975b01b 100755
--- a/test/blobfs/blobfs.sh
+++ b/test/blobfs/blobfs.sh
@@ -142,7 +142,10 @@ jq . <<- JSON > ${conf_file}
 	            "block_size": 512,
 	            "filename": "${tmp_file}"
 	          }
-	        }
+	        },
+	        {
+	          "method": "bdev_wait_for_examine"
+		}
 	      ]
 	    }
 	  ]
diff --git a/test/dd/common.sh b/test/dd/common.sh
index d2f7defa3..1475274ec 100644
--- a/test/dd/common.sh
+++ b/test/dd/common.sh
@@ -77,7 +77,10 @@ gen_conf() {
 		    {
 		      "subsystem": "bdev",
 		      "config": [
-		        ${config[*]}
+		        ${config[*]},
+			{
+			  "method": "bdev_wait_for_examine"
+			}
 		      ]
 		    }
 		    ${extra_subsystems[*]:+,${extra_subsystems[*]}}
diff --git a/test/iscsi_tgt/common.sh b/test/iscsi_tgt/common.sh
index d17a934f3..ca8d05f7c 100644
--- a/test/iscsi_tgt/common.sh
+++ b/test/iscsi_tgt/common.sh
@@ -143,6 +143,9 @@ function initiator_json_config() {
 		            "url": "iscsi://$TARGET_IP/iqn.2016-06.io.spdk:disk1/0",
 		            "initiator_iqn": "iqn.2016-06.io.spdk:disk1/0"
 		          }
+		        },
+		        {
+		          "method": "bdev_wait_for_examine"
 		        }
 		      ]
 		    }
diff --git a/test/nvme/perf/common.sh b/test/nvme/perf/common.sh
index f06e5141c..97951a059 100755
--- a/test/nvme/perf/common.sh
+++ b/test/nvme/perf/common.sh
@@ -85,7 +85,10 @@ function create_spdk_bdev_conf() {
 				{
 					"subsystem": "bdev",
 					"config": [
-						${bdev_json_cfg[*]}
+						${bdev_json_cfg[*]},
+					        {
+					                "method": "bdev_wait_for_examine"
+					        }
 					]
 				}
 			]
diff --git a/test/nvmf/common.sh b/test/nvmf/common.sh
index bf3dc2746..8c18d17f6 100644
--- a/test/nvmf/common.sh
+++ b/test/nvmf/common.sh
@@ -573,7 +573,10 @@ function gen_nvmf_target_json() {
 		        $(
 		IFS=","
 		printf '%s\n' "${config[*]}"
-		)
+		),
+			{
+			  "method": "bdev_wait_for_examine"
+			}
 		      ]
 		    }
 		  ]
diff --git a/test/ocf/integrity/fio-modes.sh b/test/ocf/integrity/fio-modes.sh
index b3801d33c..b8a28501d 100755
--- a/test/ocf/integrity/fio-modes.sh
+++ b/test/ocf/integrity/fio-modes.sh
@@ -68,6 +68,16 @@ for ((d = 0, c = 1; d <= ${#ocf_names[@]} + 2; d += 2, c++)); do
 	)
 done
 
+config+=(
+	"$(
+		cat <<- JSON
+			{
+			  "method": "bdev_wait_for_examine"
+			}
+		JSON
+	)"
+)
+
 # First ']}' closes our config and bdev subsystem blocks
 cat <<- CONFIG > "$curdir/modes.conf"
 	{"subsystems":[
diff --git a/test/ocf/integrity/mallocs.conf b/test/ocf/integrity/mallocs.conf
index 245dd23cf..0e9b7993e 100644
--- a/test/ocf/integrity/mallocs.conf
+++ b/test/ocf/integrity/mallocs.conf
@@ -50,7 +50,10 @@ gen_malloc_ocf_json () {
 		    {
 		      "subsystem": "bdev",
 		      "config": [
-		        $(IFS=","; printf '%s\n' "${config[*]}")
+		        $(IFS=","; printf '%s\n' "${config[*]}"),
+		        {
+		          "method": "bdev_wait_for_examine"
+		        }
 		      ]
 		    }
 		  ]
diff --git a/test/ocf/management/persistent-metadata.sh b/test/ocf/management/persistent-metadata.sh
index 6cecc9739..918e8e3bf 100755
--- a/test/ocf/management/persistent-metadata.sh
+++ b/test/ocf/management/persistent-metadata.sh
@@ -32,6 +32,16 @@ config+=(
 	)"
 )
 
+config+=(
+	"$(
+		cat <<- JSON
+			{
+			  "method": "bdev_wait_for_examine"
+			}
+		JSON
+	)"
+)
+
 # First ']}' closes our config and bdev subsystem blocks
 jq . <<- CONFIG > "$curdir/config"
 	{"subsystems":[
diff --git a/test/ocf/management/remove.sh b/test/ocf/management/remove.sh
index 1302f16cd..c06234080 100755
--- a/test/ocf/management/remove.sh
+++ b/test/ocf/management/remove.sh
@@ -31,6 +31,9 @@ jq . <<- JSON > "$curdir/config"
 	            "block_size": 512,
 	            "filename": "./aio1"
 	          }
+	        },
+	        {
+	          "method": "bdev_wait_for_examine"
 	        }
 	      ]
 	    }
diff --git a/test/vhost/shared/bdev.json b/test/vhost/shared/bdev.json
index ad28314a5..25945fdcf 100644
--- a/test/vhost/shared/bdev.json
+++ b/test/vhost/shared/bdev.json
@@ -13,6 +13,9 @@
             "name": "VirtioBlk0",
             "trtype": "user"
           }
+        },
+        {
+          "method": "bdev_wait_for_examine"
         }
       ]
     }