diff --git a/tests/framework/clients/filesystem.go b/tests/framework/clients/filesystem.go
index ffd446605..ecbcf6193 100644
--- a/tests/framework/clients/filesystem.go
+++ b/tests/framework/clients/filesystem.go
@@ -170,7 +170,7 @@ func (f *FilesystemOperation) CreateSubvolumeGroup(fsName, groupName string) err
 		return err
 	}
 
-	err = f.k8sh.WaitForStatusPhase(namespace, "CephFilesystemSubVolumeGroup", groupName, "Ready", 15*time.Second)
+	err = f.k8sh.WaitForStatusPhase(namespace, "CephFilesystemSubVolumeGroup", groupName, "Ready", 30*time.Second)
 	if err != nil {
 		return err
 	}
diff --git a/tests/scripts/collect-logs.sh b/tests/scripts/collect-logs.sh
index eb4d62036..c78259366 100755
--- a/tests/scripts/collect-logs.sh
+++ b/tests/scripts/collect-logs.sh
@@ -5,6 +5,7 @@ set -x
 # User parameters
 : "${CLUSTER_NAMESPACE:="rook-ceph"}"
 : "${OPERATOR_NAMESPACE:="$CLUSTER_NAMESPACE"}"
+: "${KUBE_SYSTEM_NAMESPACE:="kube-system"}"
 : "${LOG_DIR:="test"}"
 
 LOG_DIR="${LOG_DIR%/}" # remove trailing slash if necessary
@@ -17,6 +18,7 @@ $CEPH_CMD osd dump >"${LOG_DIR}"/ceph-osd-dump.txt
 $CEPH_CMD report >"${LOG_DIR}"/ceph-report.txt
 
 NAMESPACES=("$CLUSTER_NAMESPACE")
+NAMESPACES+=("$KUBE_SYSTEM_NAMESPACE")
 if [[ "$OPERATOR_NAMESPACE" != "$CLUSTER_NAMESPACE" ]]; then
   NAMESPACES+=("$OPERATOR_NAMESPACE")
 fi