diff --git a/test/pod.bats b/test/pod.bats
index 0a347a4e..7713afa6 100644
--- a/test/pod.bats
+++ b/test/pod.bats
@@ -20,11 +20,16 @@ function teardown() {
 	id="$output"
 	run ocic pod stop --id "$id"
 	[ "$status" -eq 0 ]
-	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
 	[ "$status" -eq 0 ]
+	echo "$output"
+	id="$output"
+	run ocic pod stop --id "$id"
+	[ "$status" -eq 0 ]
+	run ocic pod remove --id "$id"
+	[ "$status" -eq 0 ]
 	stop_ocid
 	cleanup_pods
 }