diff --git a/tests/cnf/ran/internal/cluster/cluster.go b/tests/cnf/ran/internal/cluster/cluster.go
index 7a12f78cf..6c90895e5 100644
--- a/tests/cnf/ran/internal/cluster/cluster.go
+++ b/tests/cnf/ran/internal/cluster/cluster.go
@@ -76,5 +76,6 @@ func isErrorExecuting(err error) bool {
 		return false
 	}
 
-	return strings.Contains(err.Error(), "error executing command in container")
+	return strings.Contains(err.Error(), "error executing command in container") ||
+		strings.Contains(err.Error(), "container not found")
 }
diff --git a/tests/cnf/ran/talm/internal/helper/cleanup.go b/tests/cnf/ran/talm/internal/helper/cleanup.go
index 9e68b2125..ba2c8ea45 100644
--- a/tests/cnf/ran/talm/internal/helper/cleanup.go
+++ b/tests/cnf/ran/talm/internal/helper/cleanup.go
@@ -19,7 +19,8 @@ func CleanupTestResourcesOnHub(client *clients.Settings, namespace, suffix strin
 	// Only errors that come from deletions are kept since an error pulling usually means it doesn't exist.
 	cgu, err := cgu.Pull(client, tsparams.CguName+suffix, namespace)
 	if err == nil {
-		_, err = cgu.Delete()
+		// CGUs often take a few seconds to delete, so make sure it is actually gone before moving on.
+		_, err = cgu.DeleteAndWait(5 * time.Minute)
 		if err != nil {
 			errorList = append(errorList, err)
 		}