diff --git a/hack/podman_cleanup_tracer.bt b/hack/podman_cleanup_tracer.bt
index f2b480c056..42c46cde9a 100755
--- a/hack/podman_cleanup_tracer.bt
+++ b/hack/podman_cleanup_tracer.bt
@@ -149,17 +149,3 @@ tracepoint:syscalls:sys_enter_write
         $offset += $len
     }
 }
-
-// HACK: debug for https://github.com/containers/podman/issues/23913
-// The test uses "ebpf-debug-23913" volume name and because and volume rm
-// will delete the path we can trap the process here to find out who actually
-// deletes it.
-tracepoint:syscalls:sys_enter_unlink*
-/ strcontains(str(args.pathname), "ebpf-debug-23913") /
-{
-    printf("Special issue 23913 volume deleted by pid %d: ", pid);
-    // This can fail to open the file it is done in user space and
-    // thus racy if the process exits quickly.
-    cat("/proc/%d/cmdline", pid);
-    print("");
-}
diff --git a/test/e2e/checkpoint_test.go b/test/e2e/checkpoint_test.go
index 0c4a0bb4a0..1498b4fa50 100644
--- a/test/e2e/checkpoint_test.go
+++ b/test/e2e/checkpoint_test.go
@@ -1131,6 +1131,7 @@ var _ = Describe("Podman checkpoint", func() {
 		)
 
 		It(testName, func() {
+			Skip("FIXME: #24571 - not working an super flaky, don't waste CI time on it")
 			podName := "test_pod"
 
 			if err := criu.CheckForCriu(criu.PodCriuVersion); err != nil {
diff --git a/test/system/220-healthcheck.bats b/test/system/220-healthcheck.bats
index e2ace7fa04..6d02946623 100644
--- a/test/system/220-healthcheck.bats
+++ b/test/system/220-healthcheck.bats
@@ -439,6 +439,7 @@ function _check_health_log {
     # Wait for background healthcheck to finish and make sure the exit status is 1
     rc=0
     wait -n $hc_pid || rc=$?
+    cat $hcStatus # just as debug in case the exit code check fails
     assert $rc -eq 1 "exit status check of healthcheck command"
     assert $(< $hcStatus) == "stopped" "Health status"
 
diff --git a/test/system/520-checkpoint.bats b/test/system/520-checkpoint.bats
index 22b834867e..5113f6785e 100644
--- a/test/system/520-checkpoint.bats
+++ b/test/system/520-checkpoint.bats
@@ -247,6 +247,11 @@ function setup() {
     run_podman inspect $cid --format "{{(index .NetworkSettings.Networks \"$netname\").MacAddress}}"
     mac1="$output"
 
+    # There is a weird flake, where the hosts content changed after restore and I don't know why.
+    # Because we start from a /etc/hosts base on the host print that.
+    echo "hosts file on the host"
+    cat /etc/hosts
+
     run_podman exec $cid cat /etc/hosts /etc/resolv.conf
     pre_hosts_resolv_conf_output="$output"
 
diff --git a/test/system/600-completion.bats b/test/system/600-completion.bats
index fd108e445b..3773cf4056 100644
--- a/test/system/600-completion.bats
+++ b/test/system/600-completion.bats
@@ -270,8 +270,7 @@ function _check_no_suggestions() {
     random_image_name="i-$(safename)"
     random_image_tag=$(random_string 5)
     random_network_name="n-$(safename)"
-    # Do not change the suffix, it is special debug for #23913
-    random_volume_name="v-$(safename)-ebpf-debug-23913"
+    random_volume_name="v-$(safename)"
     random_secret_name="s-$(safename)"
     random_secret_content=$(random_string 30)
     secret_file=$PODMAN_TMPDIR/$(random_string 10)