diff --git a/tests/cli/playbooks/aws/instance.yml b/tests/cli/playbooks/aws/instance.yml
index 1ebfb02b..449d1f69 100644
--- a/tests/cli/playbooks/aws/instance.yml
+++ b/tests/cli/playbooks/aws/instance.yml
@@ -22,11 +22,14 @@
       port: 22
       state: started
     with_items: "{{ ec2.instances }}"
+    when: item.image_id == ami_id
 
   - name: Save instance ID
     local_action: copy content={{ item.instance_id }} dest={{ tmp_dir }}/instance_id
     with_items: "{{ ec2.instances }}"
+    when: item.image_id == ami_id
 
   - name: Save public IP
     local_action: copy content={{ item.public_ip_address }} dest={{ tmp_dir }}/public_ip
     with_items: "{{ ec2.instances }}"
+    when: item.image_id == ami_id
diff --git a/tests/cli/test_build_and_deploy_aws.sh b/tests/cli/test_build_and_deploy_aws.sh
index 1d417625..ce19b119 100755
--- a/tests/cli/test_build_and_deploy_aws.sh
+++ b/tests/cli/test_build_and_deploy_aws.sh
@@ -162,7 +162,6 @@ __EOF__
                        'key_name=$KEY_NAME \
                         ssh_key_dir=$SSH_KEY_DIR \
                         ami_id=$AMI_ID \
-                        key_name=$KEY_NAME \
                         tmp_dir=$TMP_DIR' \
                      $PLAYBOOKS_DIR/instance.yml"