3 files changed, 22 insertions, 1 deletions
diff --git a/test/e2e/generate_systemd_test.go b/test/e2e/generate_systemd_test.go
index 497e8f71e..f43a4f865 100644
--- a/test/e2e/generate_systemd_test.go
+++ b/test/e2e/generate_systemd_test.go
@@ -362,7 +362,7 @@ var _ = Describe("Podman generate systemd", func() {
 		found, _ = session.GrepString("pod create --infra-conmon-pidfile %t/pod-foo.pid --pod-id-file %t/pod-foo.pod-id --name foo")
 		Expect(found).To(BeTrue())
 
-		found, _ = session.GrepString("ExecStartPre=/usr/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")
+		found, _ = session.GrepString("ExecStartPre=/bin/rm -f %t/pod-foo.pid %t/pod-foo.pod-id")
 		Expect(found).To(BeTrue())
 
 		found, _ = session.GrepString("pod stop --ignore --pod-id-file %t/pod-foo.pod-id -t 10")
diff --git a/test/e2e/images_test.go b/test/e2e/images_test.go
index 0ee7260c2..b6391cebf 100644
--- a/test/e2e/images_test.go
+++ b/test/e2e/images_test.go
@@ -296,6 +296,15 @@ WORKDIR /test
 		sortValueTest("id", 125, "badvalue")
 	})
 
+	It("test for issue #6670", func() {
+		expected := podmanTest.Podman([]string{"images", "--sort", "created", "--format", "{{.ID}}", "-q"})
+		expected.WaitWithDefaultTimeout()
+
+		actual := podmanTest.Podman([]string{"images", "--sort", "created", "-q"})
+		actual.WaitWithDefaultTimeout()
+		Expect(expected.Out).Should(Equal(actual.Out))
+	})
+
 	It("podman images --all flag", func() {
 		podmanTest.RestoreAllArtifacts()
 		dockerfile := `FROM docker.io/library/alpine:latest
diff --git a/test/e2e/search_test.go b/test/e2e/search_test.go
index 9ba0241fe..4e37f7d7a 100644
--- a/test/e2e/search_test.go
+++ b/test/e2e/search_test.go
@@ -400,4 +400,16 @@ registries = ['{{.Host}}:{{.Port}}']`
 		search.WaitWithDefaultTimeout()
 		Expect(search.ExitCode()).To(Not(Equal(0)))
 	})
+
+	It("podman search with wildcards", func() {
+		search := podmanTest.Podman([]string{"search", "--limit", "30", "registry.redhat.io/*"})
+		search.WaitWithDefaultTimeout()
+		Expect(search.ExitCode()).To(Equal(0))
+		Expect(len(search.OutputToStringArray())).To(Equal(31))
+
+		search = podmanTest.Podman([]string{"search", "registry.redhat.io/*openshift*"})
+		search.WaitWithDefaultTimeout()
+		Expect(search.ExitCode()).To(Equal(0))
+		Expect(len(search.OutputToStringArray()) > 1).To(BeTrue())
+	})
 })