diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go
index 0733197e5dd..ccbc820147e 100644
--- a/test/e2e/storage/drivers/in_tree.go
+++ b/test/e2e/storage/drivers/in_tree.go
@@ -1253,6 +1253,7 @@ func InitVSphereDriver() storageframework.TestDriver {
 				storageframework.CapExec:        true,
 				storageframework.CapMultiPODs:   true,
 				storageframework.CapTopology:    true,
+				storageframework.CapBlock:       true,
 			},
 		},
 	}
diff --git a/test/e2e/storage/testsuites/multivolume.go b/test/e2e/storage/testsuites/multivolume.go
index 2718dc51289..2f2f33a93a2 100644
--- a/test/e2e/storage/testsuites/multivolume.go
+++ b/test/e2e/storage/testsuites/multivolume.go
@@ -746,7 +746,7 @@ func getCurrentTopologiesNumber(cs clientset.Interface, nodes *v1.NodeList, keys
 				break
 			}
 		}
-		if !found {
+		if !found && len(topo) > 0 {
 			framework.Logf("found topology %v", topo)
 			topos = append(topos, topo)
 			topoCount = append(topoCount, 1)