3 files changed, 6 insertions, 12 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 6a73d8ab6..960837ebe 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -719,7 +719,7 @@ var _ = Describe("Podman generate kube", func() {
 		pod := new(v1.Pod)
 		err = yaml.Unmarshal(b, pod)
 		Expect(err).To(BeNil())
-		Expect(pod.Annotations).To(HaveKeyWithValue(define.BindMountPrefix+vol1, HaveSuffix("z")))
+		Expect(pod.Annotations).To(HaveKeyWithValue(define.BindMountPrefix, vol1+":"+"z"))
 
 		rm := podmanTest.Podman([]string{"pod", "rm", "-t", "0", "-f", "test1"})
 		rm.WaitWithDefaultTimeout()
diff --git a/test/system/250-systemd.bats b/test/system/250-systemd.bats
index 9a91501dd..8f4471f91 100644
--- a/test/system/250-systemd.bats
+++ b/test/system/250-systemd.bats
@@ -73,6 +73,11 @@ function service_cleanup() {
 # These tests can fail in dev. environment because of SELinux.
 # quick fix: chcon -t container_runtime_exec_t ./bin/podman
 @test "podman generate - systemd - basic" {
+    # Flakes with "ActiveState=failed (expected =inactive)"
+    if is_ubuntu; then
+        skip "FIXME: 2022-09-01: requires conmon-2.1.4, ubuntu has 2.1.3"
+    fi
+
     cname=$(random_string)
     # See #7407 for --pull=always.
     run_podman create --pull=always --name $cname --label "io.containers.autoupdate=registry" $IMAGE \
diff --git a/test/system/710-kube.bats b/test/system/710-kube.bats
index 58e42148a..c446ff65f 100644
--- a/test/system/710-kube.bats
+++ b/test/system/710-kube.bats
@@ -78,11 +78,6 @@ status                           | =  | null
         assert "$actual" $op "$expect" ".$key"
     done < <(parse_table "$expect")
 
-    if ! is_remote; then
-        count=$(egrep -c "$kubernetes_63" <<<"$output")
-        assert "$count" = 1 "1 instance of the Kubernetes-63-char warning"
-    fi
-
     run_podman rm $cname
 }
 
@@ -157,12 +152,6 @@ status  | =  | {}
         assert "$actual" $op "$expect" ".$key"
     done < <(parse_table "$expect")
 
-    # Why 4? Maybe two for each container?
-    if ! is_remote; then
-        count=$(egrep -c "$kubernetes_63" <<<"$output")
-        assert "$count" = 4 "instances of the Kubernetes-63-char warning"
-    fi
-
     run_podman rm $cname1 $cname2
     run_podman pod rm $pname
     run_podman rmi $(pause_image)