diff --git a/test/integration/amazon.yml b/test/integration/amazon.yml
index 25abbd08707..0ccebebf7ec 100644
--- a/test/integration/amazon.yml
+++ b/test/integration/amazon.yml
@@ -8,7 +8,7 @@
     #- { role: test_ec2_tag, tags: test_ec2_tag }
     #- { role: test_ec2_facts, tags: test_ec2_facts }
     - { role: test_ec2_elb_lb, tags: test_ec2_elb_lb }
-    #- { role: test_ec2_eip, tags: test_ec2_eip }
+    - { role: test_ec2_eip, tags: test_ec2_eip }
     #- { role: test_ec2_ami, tags: test_ec2_ami }
     #- { role: test_ec2, tags: test_ec2 }
     - { role: test_ec2_asg, tags: test_ec2_asg }
diff --git a/test/integration/roles/test_ec2_eip/tasks/main.yml b/test/integration/roles/test_ec2_eip/tasks/main.yml
index 0223fe74bd8..9f17f557e37 100644
--- a/test/integration/roles/test_ec2_eip/tasks/main.yml
+++ b/test/integration/roles/test_ec2_eip/tasks/main.yml
@@ -32,17 +32,28 @@
 # test credential parameters
 
 # ============================================================
+# create a keypair using the ssh key
 
+- name: create the keypair for ec2
+  ec2_key:
+    name: "{{ resource_prefix }}"
+    region: "{{ ec2_region }}"
+    ec2_access_key: "{{ ec2_access_key }}"
+    ec2_secret_key: "{{ ec2_secret_key }}"
+    key_material: "{{ key_material }}"
+    wait: yes
+    state: present
+
+# ============================================================
 # create test instance
 
-
 - name: create test instance
   local_action:
     module: ec2
-    key_name: "{{ eip_ec2_keyname }}"
+    key_name: "{{ resource_prefix }}"
     region: "{{ ec2_region }}"
     instance_type: t1.micro
-    image: "{{ eip_ec2_image }}"
+    image: ami-fb8e9292
     wait: yes
     instance_tags:
       Name: "{{ tag_prefix }}"
@@ -243,32 +254,32 @@
 # ============================================================
 
 # re-use existing VPC EIP with instance
-
-- name: re-use existing EIP with instance
-  ec2_eip:
-    in_vpc=yes
-    reuse_existing_ip_allowed=yes
-    instance_id={{ instance_id }}
-    ec2_access_key={{ ec2_access_key }}
-    ec2_secret_key={{ ec2_secret_key }}
-    region={{ ec2_region }}
-  register: result
-
-- name: assert new EIP was assigned
-  assert:
-    that:
-      - '"failed" not in result'
-      - '"public_ip" in result'
+# DISABLED BY JCAMMARATA
+#- name: re-use existing VPC EIP with instance
+#  ec2_eip:
+#    in_vpc=yes
+#    reuse_existing_ip_allowed=yes
+#    instance_id={{ instance_id }}
+#    ec2_access_key={{ ec2_access_key }}
+#    ec2_secret_key={{ ec2_secret_key }}
+#    region={{ ec2_region }}
+#  register: result
+#
+#- name: assert new VPC EIP was assigned
+#  assert:
+#    that:
+#      - '"failed" not in result'
+#      - '"public_ip" in result'
+#
+#
+#- name: disassociate VPC EIP associated with instance
+#  ec2_eip: state=absent public_ip={{ eip }} region={{ ec2_region }}
+#    ec2_access_key={{ ec2_access_key }}
+#    ec2_secret_key={{ ec2_secret_key }}
+#    instance_id={{ instance_id }}
 
 
-- name: disassociate EIP associated with instance
-  ec2_eip: state=absent public_ip={{ eip }} region={{ ec2_region }}
-    ec2_access_key={{ ec2_access_key }}
-    ec2_secret_key={{ ec2_secret_key }}
-    instance_id={{ instance_id }}
-
-
-- name: deactivate EIP
+- name: deactivate VPC EIP
   ec2_eip: state=absent public_ip={{ eip }} region={{ ec2_region }}
     ec2_access_key={{ ec2_access_key }}
     ec2_secret_key={{ ec2_secret_key }}