diff --git a/test/e2e/logs_test.go b/test/e2e/logs_test.go
index 93ef54c3a1..fe29b218da 100644
--- a/test/e2e/logs_test.go
+++ b/test/e2e/logs_test.go
@@ -65,7 +65,11 @@ var _ = Describe("Podman logs", func() {
 			Expect(logc).To(Exit(0))
 			cid := logc.OutputToString()
 
-			results := podmanTest.Podman([]string{"logs", cid})
+			results := podmanTest.Podman([]string{"wait", cid})
+			results.WaitWithDefaultTimeout()
+			Expect(results).To(Exit(0))
+
+			results = podmanTest.Podman([]string{"logs", cid})
 			results.WaitWithDefaultTimeout()
 			Expect(results).To(Exit(0))
 			Expect(results.OutputToStringArray()).To(HaveLen(3))
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index 464dff17a1..6361170cf6 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -303,6 +303,7 @@ EOF
     echo "$teststring" | nc 127.0.0.1 $port_out
 
     # Confirm that the container log output is the string we sent it.
+    run_podman wait $cid
     run_podman logs $cid
     is "$output" "$teststring" "test string received on container"
 
diff --git a/test/system/helpers.bash b/test/system/helpers.bash
index 3f9d0f48dd..6dccbee777 100644
--- a/test/system/helpers.bash
+++ b/test/system/helpers.bash
@@ -258,6 +258,13 @@ function wait_for_output {
         if [ $output != "true" ]; then
             run_podman inspect --format '{{.State.ExitCode}}' $cid
             exitcode=$output
+
+            # One last chance: maybe the container exited just after logs cmd
+            run_podman logs $cid
+            if expr "$logs" : ".*$expect" >/dev/null; then
+                return
+            fi
+
             die "Container exited (status: $exitcode) before we saw '$expect': $logs"
         fi