diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go
index 6ec995bfcc..ccd0334ff1 100644
--- a/test/e2e/libpod_suite_test.go
+++ b/test/e2e/libpod_suite_test.go
@@ -216,6 +216,9 @@ func WaitForContainer(p *PodmanTest) bool {
 // Cleanup cleans up the temporary store
 func (p *PodmanTest) Cleanup() {
 	// Remove all containers
+	stopall := p.Podman([]string{"stop", "-a", "--timeout", "0"})
+	stopall.WaitWithDefaultTimeout()
+
 	session := p.Podman([]string{"rm", "-fa"})
 	session.Wait(90)
 	// Nuke tempdir
diff --git a/test/e2e/wait_test.go b/test/e2e/wait_test.go
index 08eb306583..8e70352047 100644
--- a/test/e2e/wait_test.go
+++ b/test/e2e/wait_test.go
@@ -48,7 +48,7 @@ var _ = Describe("Podman wait", func() {
 	})
 
 	It("podman wait on a sleeping container", func() {
-		session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "10"})
+		session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"})
 		session.Wait(20)
 		cid := session.OutputToString()
 		Expect(session.ExitCode()).To(Equal(0))
@@ -57,7 +57,7 @@ var _ = Describe("Podman wait", func() {
 	})
 
 	It("podman wait on latest container", func() {
-		session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "10"})
+		session := podmanTest.Podman([]string{"run", "-d", ALPINE, "sleep", "1"})
 		session.Wait(20)
 		Expect(session.ExitCode()).To(Equal(0))
 		session = podmanTest.Podman([]string{"wait", "-l"})