diff --git a/test/image.bats b/test/image.bats
index ac609180..52336641 100644
--- a/test/image.bats
+++ b/test/image.bats
@@ -20,6 +20,10 @@ function teardown() {
 	run crictl create "$pod_id" "$TESTDIR"/ctr_by_imageid.json "$TESTDATA"/sandbox_config.json
 	echo "$output"
 	[ "$status" -eq 0 ]
+	ctr_id="$output"
+	run crictl start "$ctr_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
 	cleanup_ctrs
 	cleanup_pods
 	stop_crio
@@ -92,6 +96,10 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	ctr_id="$output"
 
+	run crictl start "$ctr_id"
+	echo "$output"
+	[ "$status" -eq 0 ]
+
 	run crictl inspect "$ctr_id" --output yaml
 	echo "$output"
 	[ "$status" -eq 0 ]
@@ -109,11 +117,20 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 
-	run crictl inspecti "$IMAGE"
+	run crictl images --quiet "$IMAGE"
+	[ "$status" -eq 0 ]
 	echo "$output"
+	[ "$output" != "" ]
+	imageid="$output"
+
+	run crictl images @"$imageid"
 	[ "$status" -eq 0 ]
 	[[ "$output" =~ "$IMAGE" ]]
 
+	run crictl images --quiet "$imageid"
+	[ "$status" -eq 0 ]
+	echo "$output"
+	[ "$output" != "" ]
 	cleanup_images
 	stop_crio
 }
@@ -174,12 +191,6 @@ function teardown() {
 	[ "$output" != "" ]
 	imageid="$output"
 
-	run crictl images --quiet nginx@33eb1ed1e802d4f71e52421f56af028cdf12bb3bfff5affeaf5bf0e328ffa1bc
-	[ "$status" -eq 0 ]
-	echo "$output"
-	[ "$output" != "" ]
-	imageid="$output"
-
 	run crictl images --quiet @"$imageid"
 	[ "$status" -eq 0 ]
 	echo "$output"
@@ -254,7 +265,7 @@ function teardown() {
 	[ "$status" -eq 0 ]
 	[ "$output" != "" ]
 	printf '%s\n' "$output" | while IFS= read -r id; do
-		run crictl inspecti "$id"
+		run crictl images -v "$id"
 		echo "$output"
 		[ "$status" -eq 0 ]
 		[ "$output" != "" ]
diff --git a/test/image_remove.bats b/test/image_remove.bats
index a2f6f2e8..54b06c05 100644
--- a/test/image_remove.bats
+++ b/test/image_remove.bats
@@ -11,7 +11,7 @@ function teardown() {
 @test "image remove with multiple names, by name" {
 	start_crio "" "" --no-pause-image
 	# Pull the image, giving it one name.
-	run crioctl image pull "$IMAGE"
+	run crictl pull "$IMAGE"
 	echo "$output"
 	[ "$status" -eq 0 ]
 	# Add a second name to the image.
@@ -19,19 +19,19 @@ function teardown() {
 	echo "$output"
 	[ "$status" -eq 0 ]
 	# Get the list of image names and IDs.
-	run crioctl image list
+	run crictl images -v
 	echo "$output"
 	[ "$status" -eq 0 ]
 	[ "$output" != "" ]
 	# Cycle through each name, removing it by name.  The image that we assigned a second
 	# name to should still be around when we get to removing its second name.
-	grep ^Tag: <<< "$output" | while read -r header tag ; do
-		run crioctl image remove --id "$tag"
+	grep ^RepoTags: <<< "$output" | while read -r header tag ignored ; do
+		run crictl rmi "$tag"
 		echo "$output"
 		[ "$status" -eq 0 ]
 	done
 	# List all images and their names.  There should be none now.
-	run crioctl image list --quiet
+	run crictl images --quiet
 	echo "$output"
 	[ "$status" -eq 0 ]
 	[ "$output" = "" ]
@@ -46,28 +46,29 @@ function teardown() {
 @test "image remove with multiple names, by ID" {
 	start_crio "" "" --no-pause-image
 	# Pull the image, giving it one name.
-	run crioctl image pull "$IMAGE"
+	run crictl pull "$IMAGE"
 	echo "$output"
 	[ "$status" -eq 0 ]
 	# Add a second name to the image.
 	run "$COPYIMG_BINARY" --root "$TESTDIR/crio" $STORAGE_OPTIONS --runroot "$TESTDIR/crio-run" --image-name="$IMAGE":latest --add-name="$IMAGE":othertag --signature-policy="$INTEGRATION_ROOT"/policy.json
 	echo "$output"
 	[ "$status" -eq 0 ]
-	# Get the image ID of the image we just saved.
-	run crioctl image status --id="$IMAGE"
+	# Get the list of the image's names and its ID.
+	run crictl images -v "$IMAGE":latest
 	echo "$output"
 	[ "$status" -eq 0 ]
 	[ "$output" != "" ]
 	# Try to remove the image using its ID.  That should succeed.
 	grep ^ID: <<< "$output" | while read -r header id ; do
-		run crioctl image remove --id "$id"
+		run crictl rmi "$id"
 		echo "$output"
-		[ "$status" -ne 0 ]
+		[ "$status" -eq 0 ]
 	done
 	# The image should be gone now.
-	run crioctl image status --id="$IMAGE"
+	run crictl images -v "$IMAGE"
 	echo "$output"
-	[ "$status" -ne 0 ]
+	[ "$status" -eq 0 ]
+	[ "$output" = "" ]
 	# All done.
 	cleanup_images
 	stop_crio
diff --git a/test/image_volume.bats b/test/image_volume.bats
index 1b2d967b..f5b39401 100644
--- a/test/image_volume.bats
+++ b/test/image_volume.bats
@@ -55,7 +55,7 @@ function teardown() {
 	run crictl exec --sync "$ctr_id" touch /imagevolume/test_file
 	echo "$output"
 	[ "$status" -eq 0 ]
-
+	[ "$output" = "" ]
 	run crictl stops "$pod_id"
 	echo "$output"
 	[ "$status" -eq 0 ]