diff --git a/scripts/collect-test-info.sh b/scripts/collect-test-info.sh
index bf98f0323..031c26222 100755
--- a/scripts/collect-test-info.sh
+++ b/scripts/collect-test-info.sh
@@ -111,6 +111,7 @@ sudo cp -a "/var/log/ironic-inspector/ramdisk" ${LOG_LOCATION}/inspection-ramdis
 # general info
 sudo ps auxf &> ${LOG_LOCATION}/ps.txt
 sudo lscpu > ${LOG_LOCATION}/lscpu.txt
+sudo lshw -json >  ${LOG_LOCATION}/lshw_json.txt
 # vbmc info
 sudo ${VENV}/bin/vbmc list &> ${LOG_LOCATION}/vbmc.txt
 # virsh info
diff --git a/scripts/test-bifrost.sh b/scripts/test-bifrost.sh
index ae50caa00..9782291e6 100755
--- a/scripts/test-bifrost.sh
+++ b/scripts/test-bifrost.sh
@@ -80,6 +80,13 @@ if [ ${DOWNLOAD_CUSTOM_DEPLOY_IMAGE} = "true" ] && [ ! -f "$HOME/.ssh/id_ecdsa.p
     ssh-keygen -t ECDSA -f "$HOME/.ssh/id_ecdsa" -N ""
 fi
 
+# Install lshw to collect info at the end of the test
+if which rpm &> /dev/null; then
+    sudo dnf install -y lshw
+elif which apt &> /dev/null; then
+    sudo apt install -y lshw
+fi
+
 # Note(cinerama): activate is not compatible with "set -u";
 # disable it just for this line.
 set +u