4 files changed, 40 insertions, 4 deletions
diff --git a/test/system/005-info.bats b/test/system/005-info.bats
index 5df6033fc..f229b0886 100644
--- a/test/system/005-info.bats
+++ b/test/system/005-info.bats
@@ -11,7 +11,7 @@ load helpers
 BuildahVersion: *[0-9.]\\\+
 Conmon:\\\s\\\+package:
 Distribution:
-OCIRuntime:\\\s\\\+package:
+OCIRuntime:\\\s\\\+name:
 os:
 rootless:
 registries:
diff --git a/test/system/015-help.bats b/test/system/015-help.bats
index a987f04bc..fd4be87b2 100644
--- a/test/system/015-help.bats
+++ b/test/system/015-help.bats
@@ -55,9 +55,11 @@ function check_help() {
 
         # If usage has required arguments, try running without them
         if expr "$usage" : '.*\[flags\] [A-Z]' >/dev/null; then
-            dprint "podman $@ $cmd (without required args)"
-            run_podman 125 "$@" $cmd
-            is "$output" "Error:"
+            if [ "$cmd" != "stats"]; then
+                dprint "podman $@ $cmd (without required args)"
+                run_podman 125 "$@" $cmd
+                is "$output" "Error:"
+            fi
         fi
 
         count=$(expr $count + 1)
diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats
index 11cb98269..472fdd1ab 100644
--- a/test/system/075-exec.bats
+++ b/test/system/075-exec.bats
@@ -29,4 +29,24 @@ load helpers
     run_podman rm $cid
 }
 
+@test "podman exec - leak check" {
+    skip_if_remote
+
+    # Start a container in the background then run exec command
+    # three times and make sure no any exec pid hash file leak
+    run_podman run -td $IMAGE /bin/sh
+    cid="$output"
+
+    is "$(check_exec_pid)" "" "exec pid hash file indeed doesn't exist"
+
+    for i in {1..3}; do
+        run_podman exec $cid /bin/true
+    done
+
+    is "$(check_exec_pid)" "" "there isn't any exec pid hash file leak"
+
+    run_podman stop --time 1 $cid
+    run_podman rm -f $cid
+}
+
 # vim: filetype=sh
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 3d607f4bd..8c061d2c9 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -373,5 +373,19 @@ function random_string() {
     head /dev/urandom | tr -dc a-zA-Z0-9 | head -c$length
 }
 
+
+#########################
+#  find_exec_pid_files  #  Returns nothing or exec_pid hash files
+#########################
+#
+# Return exec_pid hash files if exists, otherwise, return nothing
+#
+function find_exec_pid_files() {
+    run_podman info --format '{{.store.RunRoot}}'
+    local storage_path="$output"
+    if [ -d $storage_path ]; then
+        find $storage_path -type f -iname 'exec_pid_*'
+    fi
+}
 # END   miscellaneous tools
 ###############################################################################