diff --git a/autotest.sh b/autotest.sh
index e305b021d..07c7faf23 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -45,7 +45,7 @@ if [ $(uname -s) = Linux ]; then
 	fi
 fi
 
-trap "process_core || :; autotest_cleanup; exit 1" SIGINT SIGTERM EXIT
+trap "process_core || :; autotest_cleanup || :; revert_soft_roce; exit 1" SIGINT SIGTERM EXIT
 
 timing_enter autotest
 
@@ -353,6 +353,7 @@ fi
 
 timing_enter cleanup
 autotest_cleanup
+revert_soft_roce
 timing_exit cleanup
 
 timing_exit autotest
diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh
index c85aa3f5b..279c43750 100755
--- a/test/common/autotest_common.sh
+++ b/test/common/autotest_common.sh
@@ -1237,7 +1237,6 @@ function autotest_cleanup() {
 	if [[ -e /proc/$udevadm_pid/status ]]; then
 		kill "$udevadm_pid" || :
 	fi
-	revert_soft_roce
 
 	shopt -s nullglob
 	local storage_fallback_purge=("${TMPDIR:-/tmp}/spdk."??????)