3 files changed, 24 insertions, 9 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go
index e36c86690..226b71627 100644
--- a/test/e2e/common_test.go
+++ b/test/e2e/common_test.go
@@ -235,14 +235,7 @@ func PodmanTestCreateUtil(tempDir string, remote bool) *PodmanTestIntegration {
 
 	ociRuntime := os.Getenv("OCI_RUNTIME")
 	if ociRuntime == "" {
-		var err error
-		ociRuntime, err = exec.LookPath("crun")
-		// If we cannot find the crun binary, setting to something static as we have no way
-		// to return an error.  The tests will fail and point out that the runc binary could
-		// not be found nicely.
-		if err != nil {
-			ociRuntime = "/usr/bin/runc"
-		}
+		ociRuntime = "crun"
 	}
 	os.Setenv("DISABLE_HC_SYSTEMD", "true")
 	CNIConfigDir := "/etc/cni/net.d"
diff --git a/test/e2e/play_kube_test.go b/test/e2e/play_kube_test.go
index 3906fa49d..7ab8dc6f8 100644
--- a/test/e2e/play_kube_test.go
+++ b/test/e2e/play_kube_test.go
@@ -1447,4 +1447,23 @@ MemoryReservation: {{ .HostConfig.MemoryReservation }}`})
 			Expect(inspect.OutputToString()).To(ContainSubstring("Memory: " + expectedMemoryLimit))
 		}
 	})
+
+	It("podman play kube reports invalid image name", func() {
+		invalidImageName := "./myimage"
+
+		pod := getPod(
+			withCtr(
+				getCtr(
+					withImage(invalidImageName),
+				),
+			),
+		)
+		err := generateKubeYaml("pod", pod, kubeYaml)
+		Expect(err).To(BeNil())
+
+		kube := podmanTest.Podman([]string{"play", "kube", kubeYaml})
+		kube.WaitWithDefaultTimeout()
+		Expect(kube.ExitCode()).To(Equal(125))
+		Expect(kube.ErrorToString()).To(ContainSubstring(invalidImageName))
+	})
 })
diff --git a/test/e2e/runlabel_test.go b/test/e2e/runlabel_test.go
index 81a746b86..7c0b8bc9b 100644
--- a/test/e2e/runlabel_test.go
+++ b/test/e2e/runlabel_test.go
@@ -88,12 +88,15 @@ var _ = Describe("podman container runlabel", func() {
 		result := podmanTest.Podman([]string{"container", "runlabel", "RUN", ALPINE})
 		result.WaitWithDefaultTimeout()
 		Expect(result).To(ExitWithError())
+		// should not panic when label missing the value or don't have the label
+		Expect(result.LineInOutputContains("panic")).NotTo(BeTrue())
 	})
 	It("podman container runlabel bogus label in remote image should result in non-zero exit", func() {
 		result := podmanTest.Podman([]string{"container", "runlabel", "RUN", "docker.io/library/ubuntu:latest"})
 		result.WaitWithDefaultTimeout()
 		Expect(result).To(ExitWithError())
-
+		// should not panic when label missing the value or don't have the label
+		Expect(result.LineInOutputContains("panic")).NotTo(BeTrue())
 	})
 
 	It("podman container runlabel global options", func() {