diff --git a/contrib/test/integration/system.yml b/contrib/test/integration/system.yml
index 6adc4f2a..da1e8a93 100644
--- a/contrib/test/integration/system.yml
+++ b/contrib/test/integration/system.yml
@@ -108,4 +108,4 @@
 
 - name: Update the kernel cmdline to include quota support
   command: grubby --update-kernel=ALL --args="rootflags=pquota"
-  when: ansible_distribution in ['RedHat', 'CentOS']
\ No newline at end of file
+  when: ansible_distribution in ['RedHat', 'CentOS']
diff --git a/test/apparmor.bats b/test/apparmor.bats
index babfb170..e5c89bf0 100644
--- a/test/apparmor.bats
+++ b/test/apparmor.bats
@@ -27,7 +27,6 @@ function teardown() {
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    [ "$status" -eq 0 ]
     run crioctl ctr execsync --id "$ctr_id" touch test.txt
     echo "$output"
     [ "$status" -eq 0 ]
@@ -60,7 +59,6 @@ function teardown() {
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    [ "$status" -eq 0 ]
     run crioctl ctr execsync --id "$ctr_id" touch test.txt
     echo "$output"
     [ "$status" -ne 0 ]
@@ -94,7 +92,6 @@ function teardown() {
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    [ "$status" -eq 0 ]
     run crioctl ctr execsync --id "$ctr_id" touch test.txt
     echo "$output"
     [ "$status" -ne 0 ]
@@ -156,7 +153,6 @@ function teardown() {
     echo "$output"
     [ "$status" -eq 0 ]
     ctr_id="$output"
-    [ "$status" -eq 0 ]
     run crioctl ctr execsync --id "$ctr_id" touch test.txt
     echo "$output"
     [ "$status" -eq 0 ]
diff --git a/test/ctr.bats b/test/ctr.bats
index 79eae2a3..2f225187 100644
--- a/test/ctr.bats
+++ b/test/ctr.bats
@@ -560,6 +560,7 @@ function teardown() {
 	run crioctl ctr execsync --id "$ctr_id" --timeout 1 sleep 10
 	echo "$output"
 	[[ "$output" =~ "command timed out" ]]
+	[ "$status" -ne 0 ]
 	run crioctl pod stop --id "$pod_id"
 	echo "$output"
 	[ "$status" -eq 0 ]
@@ -766,7 +767,7 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 	# Wait for container to OOM
-	run sleep 100
+	sleep 100
 	run crioctl ctr status --id "$ctr_id"
 	echo "$output"
 	[ "$status" -eq 0 ]
diff --git a/test/hooks.bats b/test/hooks.bats
index 0c1a51ea..92aa725f 100644
--- a/test/hooks.bats
+++ b/test/hooks.bats
@@ -10,7 +10,7 @@ cp hooks/checkhook.sh ${HOOKSDIR}
 sed "s|HOOKSDIR|${HOOKSDIR}|" hooks/checkhook.json > ${HOOKSDIR}/checkhook.json
 
 @test "pod test hooks" {
-	run rm -f /run/hookscheck
+	rm -f /run/hookscheck
 	start_crio
 	run crioctl pod run --config "$TESTDATA"/sandbox_config.json
 	echo "$output"
diff --git a/test/kpod_images.bats b/test/kpod_images.bats
index 92e63aa3..0448d61b 100644
--- a/test/kpod_images.bats
+++ b/test/kpod_images.bats
@@ -38,6 +38,7 @@ function teardown() {
     [ "$status" -eq 0 ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} images --format json
     echo "$output"
+    [ "$status" -eq 0 ]
     name=$(echo $output | python -c 'import sys; import json; print(json.loads(sys.stdin.read())[0])["names"][0]')
     [ "$name" = "docker.io/library/${IMAGE}" ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} rmi ${IMAGE}
diff --git a/test/kpod_pause.bats b/test/kpod_pause.bats
index 746d39db..84321beb 100644
--- a/test/kpod_pause.bats
+++ b/test/kpod_pause.bats
@@ -59,6 +59,7 @@ function teardown() {
     ctr_id="$output"
     run crioctl ctr start --id "$ctr_id"
     echo "$output"
+    [ "$status" -eq 0 ]
     id="$output"
     run ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$id"
     echo "$output"
@@ -87,6 +88,7 @@ function teardown() {
     ctr_id="$output"
     run crioctl ctr start --id "$ctr_id"
     echo "$output"
+    [ "$status" -eq 0 ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} pause "k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-crio_0"
     echo "$output"
     [ "$status" -eq 0 ]
@@ -115,6 +117,7 @@ function teardown() {
     run crioctl ctr start --id "$ctr_id"
     echo "$output"
     id="$output"
+    [ "$status" -eq 0 ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} pause "$id"
     echo "$output"
     [ "$status" -eq 0 ]
diff --git a/test/kpod_ps.bats b/test/kpod_ps.bats
index 4b2628d3..a4a7b6cb 100644
--- a/test/kpod_ps.bats
+++ b/test/kpod_ps.bats
@@ -167,12 +167,10 @@ IMAGE="redis:alpine"
     cleanup_ctrs
     cleanup_pods
     stop_crio
-    [ "$status" -eq 0 ]
 }
 
 @test "kpod ps namespace flag" {
     start_crio
-    [ "$status" -eq 0 ]
     run crioctl pod run --config "$TESTDATA"/sandbox_config.json
     echo "$output"
     [ "$status" -eq 0 ]
@@ -215,7 +213,6 @@ IMAGE="redis:alpine"
 
 @test "kpod ps without namespace flag and format flag = json" {
     start_crio
-    [ "$status" -eq 0 ]
     run crioctl pod run --config "$TESTDATA"/sandbox_config.json
     echo "$output"
     [ "$status" -eq 0 ]
@@ -231,7 +228,6 @@ IMAGE="redis:alpine"
     cleanup_ctrs
     cleanup_pods
     stop_crio
-    [ "$status" -eq 0 ]
 }
 
 @test "kpod ps format flag = go template" {
diff --git a/test/kpod_rename.bats b/test/kpod_rename.bats
index 488449aa..ed3fdada 100644
--- a/test/kpod_rename.bats
+++ b/test/kpod_rename.bats
@@ -19,6 +19,7 @@ function teardown() {
     [ "$status" -eq 0 ]
     run crioctl ctr create --config "$TESTDATA"/container_config.json --pod "$pod_id"
     ctr_id="$output"
+    [ "$status" -eq 0 ]
     run ${KPOD_BINARY} $KPOD_OPTIONS rename "$ctr_id" "$NEW_NAME"
     echo "$output"
     [ "$status" -eq 0 ]
diff --git a/test/kpod_save.bats b/test/kpod_save.bats
index 4f71ae78..d8c581a5 100644
--- a/test/kpod_save.bats
+++ b/test/kpod_save.bats
@@ -30,7 +30,6 @@ function teardown() {
 	run ${KPOD_BINARY} ${KPOD_OPTIONS} rmi $IMAGE
 	[ "$status" -eq 0 ]
 	rm -f alpine.tar
-	[ "$status" -eq 0 ]
 }
 
 @test "kpod save using stdout" {
diff --git a/test/kpod_stop.bats b/test/kpod_stop.bats
index 08b4c933..72e818d4 100644
--- a/test/kpod_stop.bats
+++ b/test/kpod_stop.bats
@@ -25,7 +25,10 @@ function teardown() {
     run crioctl ctr start --id "$ctr_id"
     echo "$output"
     id="$output"
+    [ "$status" -eq 0 ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} stop "$id"
+    echo "$output"
+    [ "$status" -eq 0 ]
     cleanup_pods
     stop_crio
 }
@@ -41,8 +44,15 @@ function teardown() {
     [ "$status" -eq 0 ]
     ctr_id="$output"
     run crioctl ctr start --id "$ctr_id"
+    [ "$status" -eq 0 ]
+    run crioctl ctr inspect --id "$ctr_id"
     echo "$output"
-    run ${KPOD_BINARY} ${KPOD_OPTIONS} stop "k8s_podsandbox1-redis_podsandbox1_redhat.test.crio_redhat-test-crio_0"
+    [ "$status" -eq 0 ]
+    ctr_name=$(python -c 'import json; import sys; print json.load(sys.stdin)["crio_annotations"]["io.kubernetes.cri-o.Name"]' <<< "$output")
+    echo container name is \""$ctr_name"\"
+    run ${KPOD_BINARY} ${KPOD_OPTIONS} stop "$ctr_name"
+    echo "$output"
+    [ "$status" -eq 0 ]
     cleanup_pods
     stop_crio
 }
diff --git a/test/kpod_wait.bats b/test/kpod_wait.bats
index f1e02b7c..ba7556b2 100644
--- a/test/kpod_wait.bats
+++ b/test/kpod_wait.bats
@@ -34,6 +34,7 @@ function container_start() {
 @test "wait on a stopped container" {
     run ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
     echo $output
+    [ "$status" -eq 0 ]
     start_crio
     pod_id=$( pod_run_from_template "test" "test" "test1-1" )
     echo $pod_id
@@ -50,6 +51,7 @@ function container_start() {
 @test "wait on a sleeping container" {
     run ${KPOD_BINARY} ${KPOD_OPTIONS} pull docker.io/library/busybox:latest
     echo $output
+    [ "$status" -eq 0 ]
     start_crio
     pod_id=$( pod_run_from_template "test" "test" "test1-1" )
     echo $pod_id
@@ -57,6 +59,7 @@ function container_start() {
     echo $ctr_id
     run container_start $ctr_id
     echo $output
+    [ "$status" -eq 0 ]
     run ${KPOD_BINARY} ${KPOD_OPTIONS} wait $ctr_id
     echo $output
     [ "$status" -eq 0 ]
diff --git a/test/network.bats b/test/network.bats
index eef4bbe0..d9d0304b 100644
--- a/test/network.bats
+++ b/test/network.bats
@@ -121,10 +121,8 @@ function teardown() {
 	ctr2_id="$output"
 
 	ping_pod_from_pod $ctr1_id $ctr2_id
-	[ "$status" -eq 0 ]
 
 	ping_pod_from_pod $ctr2_id $ctr1_id
-	[ "$status" -eq 0 ]
 }
 
 @test "Ensure correct CNI plugin namespace/name/container-id arguments" {
@@ -165,6 +163,7 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	run crioctl ctr stop --id "$ctr_id"
 	echo "$output"
+	[ "$status" -eq 0 ]
 }
 
 @test "Clean up network if pod sandbox fails" {
@@ -174,6 +173,8 @@ function teardown() {
 	# networking has been configured
 	chmod 0644 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon
 	run crioctl pod run --config "$TESTDATA"/sandbox_config.json
+	echo "$output"
+	[ "$status" -ne 0 ]
 	chmod 0755 /go/src/github.com/kubernetes-incubator/cri-o/conmon/conmon
 
 	# ensure that the server cleaned up sandbox networking if the sandbox