diff --git a/xCAT-test/autotest/testcase/infiniband/cases0 b/xCAT-test/autotest/testcase/infiniband/cases0
index c66b66ca7..f634bae17 100644
--- a/xCAT-test/autotest/testcase/infiniband/cases0
+++ b/xCAT-test/autotest/testcase/infiniband/cases0
@@ -24,6 +24,9 @@ cmd:updatenode $$CN -P confignetwork
 check:rc==0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/sysconfig/network/ifcfg-ib0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN  "grep 11.1.0.100 /etc/sysconfig/network-scripts/ifcfg-ib0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "grep 11.1.0.100 /etc/network/interfaces.d/ib0";else echo "Sorry,this is not supported os"; fi
 check:output=~11.1.0.100
+cmd:xdsh $$CN "ping -c 1 11.1.0.100"
+check:rc==0
+# Clean up
 cmd:xdsh $$CN "ip addr del 11.1.0.100/16 dev ib0"
 cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
 cmd:if grep SUSE /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network/ifcfg-ib0"; elif grep "Red Hat" /etc/*release;then xdsh $$CN "rm -rf /etc/sysconfig/network-scripts/ifcfg-ib0"; elif grep Ubuntu /etc/*release;then xdsh $$CN "rm -rf /etc/network/interfaces.d/ib0";else echo "Sorry,this is not supported os"; fi
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
index 66ceb74fe..ede9f8aa4 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskfull-install.sh
@@ -141,10 +141,12 @@ mkdir -p "${OSIMAGE_OTHERPKGDIR}"/dkms
 [ "$?" -ne "0" ] && echo "File ${DKMS_RPM} not found." >&2 && exit 1
 cp "${DKMS_RPM}" "${OSIMAGE_OTHERPKGDIR}/dkms"
 
+( cd "${OSIMAGE_OTHERPKGDIR}" && createrepo . )
+
 makedhcp -n
 rinstall "${COMPUTE_NODE}" "osimage=${OSIMAGE_NAME}"
 
-NETBOOT_TIMEOUT=600
+INSTALL_TIMEOUT=1800
 declare -i WAIT=0
 
 while sleep 10
@@ -152,8 +154,8 @@ do
 	(( WAIT += 10 ))
 	nodestat "${COMPUTE_NODE}" | grep ': sshd$'
 	[ "$?" -eq "0" ] && break
-	[ "${WAIT}" -le "${NETBOOT_TIMEOUT}" ]
-	[ "$?" -ne "0" ] && echo "Netboot failed" >&2 && exit 1
+	[ "${WAIT}" -le "${INSTALL_TIMEOUT}" ]
+	[ "$?" -ne "0" ] && echo "Operating system installation failed" >&2 && exit 1
 done
 
 # For workaround the GitHub issue #3549
@@ -162,7 +164,7 @@ sleep 5
 xdsh "${COMPUTE_NODE}" date
 [ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
 
-xdsh "${COMPUTE_NODE}" 'rpm -qa'  | grep 'mlnx'
-[ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed" >&2 && exit 1
+xdsh "${COMPUTE_NODE}" 'rpm -qa' | grep 'mlnx'
+[ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed." >&2 && exit 1
 
 exit 0
diff --git a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
index a5aad0e07..216ebaa63 100755
--- a/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
+++ b/xCAT-test/autotest/testcase/infiniband/rhel-infiniband-diskless-install.sh
@@ -180,7 +180,7 @@ sleep 5
 xdsh "${COMPUTE_NODE}" date
 [ "$?" -ne "0" ] && echo "Failed connect to compute node via SSH." >&2 && exit 1
 
-xdsh "${COMPUTE_NODE}" 'rpm -qa'  | grep 'mlnx'
-[ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed" >&2 && exit 1
+xdsh "${COMPUTE_NODE}" 'rpm -qa' | grep 'mlnx'
+[ "$?" -ne "0" ] && echo "MLNX OFED installation checking failed." >&2 && exit 1
 
 exit 0