diff --git a/test/README.md b/test/README.md
index f9c593ca..1730a15c 100644
--- a/test/README.md
+++ b/test/README.md
@@ -59,7 +59,6 @@ function setup() {
 
 # teardown is called at the end of every test.
 function teardown() {
-	stop_ocid
 	cleanup_test
 }
 
diff --git a/test/pod.bats b/test/pod.bats
index c1ab938f..0ed6496c 100644
--- a/test/pod.bats
+++ b/test/pod.bats
@@ -19,7 +19,7 @@ function teardown() {
 	id="$output"
 	run ocic pod stop --id "$id"
 	[ "$status" -eq 0 ]
-	sleep 5 # FIXME: there's a race between container kill and delete below
+	sleep 1 # FIXME: there's a race between container kill and delete below
 	run ocic pod remove --id "$id"
 	[ "$status" -eq 0 ]
 	run ocic pod create --config "$TESTDATA"/sandbox_config.json