diff --git a/pkg/ceph/osd/agent_test.go b/pkg/ceph/osd/agent_test.go
index 0a036e2bf..3ae8a859e 100644
--- a/pkg/ceph/osd/agent_test.go
+++ b/pkg/ceph/osd/agent_test.go
@@ -355,10 +355,11 @@ func TestGetPartitionPerfScheme(t *testing.T) {
 	assert.Equal(t, "sdc", scheme.Metadata.Device)
 	assert.Equal(t, 4, len(scheme.Metadata.Partitions))
 
-	// verify the first entry in the performance partition scheme.
+	// verify the first entry in the performance partition scheme.  note that the block device will either be sda or
+	// sdb because ordering of map traversal in golang isn't guaranteed.  Ensure that the first is either sda or sdb
+	// and that the second is the other one.
 	entry := scheme.Entries[0]
 	assert.Equal(t, 11, entry.ID)
-	// verify the first entry in the performance partition scheme.
 	firstBlockDevice := entry.Partitions[BlockPartitionType].Device
 	assert.True(t, firstBlockDevice == "sda" || firstBlockDevice == "sdb", firstBlockDevice)
 	verifyPartitionEntry(t, entry.Partitions[BlockPartitionType], firstBlockDevice, -1, 1)
diff --git a/tests/integration/base_block_test.go b/tests/integration/base_block_test.go
index 94c4d8ffa..4fbf46fce 100644
--- a/tests/integration/base_block_test.go
+++ b/tests/integration/base_block_test.go
@@ -124,7 +124,8 @@ func runBlockE2ETestLite(helper *clients.TestClient, k8sh *utils.K8sHelper, s su
 	//Make sure  new block is created
 	b, _ := bc.BlockList()
 	assert.Equal(s.T(), initBlockCount+1, len(b), "Make sure new block image is created")
-	poolExists := foundPool(helper, s, poolName)
+	poolExists, err := foundPool(helper, s, poolName)
+	assert.Nil(s.T(), err)
 	assert.True(s.T(), poolExists)
 
 	//Delete pvc and storageclass
@@ -143,7 +144,11 @@ func runBlockE2ETestLite(helper *clients.TestClient, k8sh *utils.K8sHelper, s su
 func checkPoolDeleted(helper *clients.TestClient, s suite.Suite, name string) {
 	i := 0
 	for i < utils.RetryLoop {
-		if !foundPool(helper, s, name) {
+		found, err := foundPool(helper, s, name)
+		if err != nil {
+			// try again on failure since the pool may have been in an unexpected state while deleting
+			logger.Warningf("error getting pools. %+v", err)
+		} else if !found {
 			logger.Infof("pool %s is deleted", name)
 			return
 		}
@@ -154,16 +159,18 @@ func checkPoolDeleted(helper *clients.TestClient, s suite.Suite, name string) {
 	assert.Fail(s.T(), fmt.Sprintf("pool %s was not deleted", name))
 }
 
-func foundPool(helper *clients.TestClient, s suite.Suite, name string) bool {
+func foundPool(helper *clients.TestClient, s suite.Suite, name string) (bool, error) {
 	p := helper.GetPoolClient()
 	pools, err := p.PoolList()
-	assert.Nil(s.T(), err)
+	if err != nil {
+		return false, err
+	}
 	for _, pool := range pools {
 		if name == pool.Name {
-			return true
+			return true, nil
 		}
 	}
-	return false
+	return false, nil
 }
 
 func blockTestDataCleanUp(helper *clients.TestClient, k8sh *utils.K8sHelper, namespace, poolname, storageclassname, blockname, podname string) {