diff --git a/tests/integration/help.bats b/tests/integration/help.bats
index 04bbc80cf..64cc66f67 100644
--- a/tests/integration/help.bats
+++ b/tests/integration/help.bats
@@ -22,69 +22,37 @@ function setup() {
 }
 
 @test "runc command -h" {
-	runc checkpoint -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ checkpoint+ ]]
-
-	runc delete -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ delete+ ]]
-
-	runc events -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ events+ ]]
-
-	runc exec -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ exec+ ]]
-
-	runc kill -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ kill+ ]]
-
-	runc list -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[0]} =~ NAME:+ ]]
-	[[ ${lines[1]} =~ runc\ list+ ]]
-
-	runc list --help
-	[ "$status" -eq 0 ]
-	[[ ${lines[0]} =~ NAME:+ ]]
-	[[ ${lines[1]} =~ runc\ list+ ]]
-
-	runc pause -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ pause+ ]]
-
-	runc restore -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ restore+ ]]
-
-	runc resume -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ resume+ ]]
-
-	# We don't use runc_spec here, because we're just testing the help page.
-	runc spec -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ spec+ ]]
-
-	runc start -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ start+ ]]
-
-	runc run -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ run+ ]]
-
-	runc state -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ state+ ]]
-
-	runc update -h
-	[ "$status" -eq 0 ]
-	[[ ${lines[1]} =~ runc\ update+ ]]
+	local runc
+	# shellcheck disable=SC2153
+	runc="$(basename "$RUNC")"
+	local cmds=(
+		checkpoint
+		create
+		delete
+		events
+		exec
+		kill
+		list
+		pause
+		ps
+		restore
+		resume
+		run
+		spec
+		start
+		state
+		update
+		features
+	)
 
+	for cmd in "${cmds[@]}"; do
+		for arg in "-h" "--help"; do
+			runc "$cmd" "$arg"
+			[ "$status" -eq 0 ]
+			[[ ${lines[0]} =~ NAME:+ ]]
+			[[ ${lines[1]} =~ $runc\ $cmd+ ]]
+		done
+	done
 }
 
 @test "runc foo -h" {
diff --git a/tests/integration/selinux.bats b/tests/integration/selinux.bats
index 40a122e06..66665c450 100644
--- a/tests/integration/selinux.bats
+++ b/tests/integration/selinux.bats
@@ -11,7 +11,7 @@ function setup() {
 	setup_busybox
 
 	# Use a copy of runc binary with proper selinux label set.
-	cp "$RUNC" .
+	cp "$RUNC" ./runc
 	export RUNC="$PWD/runc"
 	chcon -u system_u -r object_r -t container_runtime_exec_t "$RUNC"