diff --git a/test/integration/kpatch-test b/test/integration/kpatch-test
index c0bd0ac..16019da 100755
--- a/test/integration/kpatch-test
+++ b/test/integration/kpatch-test
@@ -117,14 +117,7 @@ log() {
 }
 
 unload_all() {
-	for i in `/sbin/lsmod |egrep '^kpatch' |awk '{print $1}'`; do
-		if [[ $i != kpatch ]]; then
-			$KPATCH unload $i >> $LOG 2>&1 || error "\"kpatch unload $i\" failed"
-		fi
-	done
-	if /sbin/lsmod |egrep -q '^kpatch'; then
-		$RMMOD kpatch >> $LOG 2>&1 || error "\"rmmod kpatch\" failed"
-	fi
+	$KPATCH unload --all
 }
 
 build_module() {