diff --git a/tests/integration/targets/elb_classic_lb_info/tasks/main.yml b/tests/integration/targets/elb_classic_lb_info/tasks/main.yml
index e4cd8144b1e..dc099388648 100644
--- a/tests/integration/targets/elb_classic_lb_info/tasks/main.yml
+++ b/tests/integration/targets/elb_classic_lb_info/tasks/main.yml
@@ -18,10 +18,10 @@
 
 - module_defaults:
     group/aws:
-      region: "{{ ec2_region }}"
-      ec2_access_key: "{{ ec2_access_key }}"
-      ec2_secret_key: "{{ ec2_secret_key }}"
-      security_token: "{{ security_token | default(omit) }}"
+      region: "{{ aws_region }}"
+      access_key: "{{ aws_access_key }}"
+      secret_key: "{{ aws_secret_key }}"
+      session_token: "{{ security_token | default(omit) }}"
   block:
 
     # ============================================================
@@ -32,8 +32,8 @@
         name: "{{ elb_name }}"
         state: present
         zones:
-          - "{{ ec2_region }}a"
-          - "{{ ec2_region }}b"
+          - "{{ aws_region }}a"
+          - "{{ aws_region }}b"
         listeners:
           - protocol: http
             load_balancer_port: 80
@@ -55,8 +55,8 @@
         that:
           - create is changed
           # We rely on these for the info test, make sure they're what we expect
-          - '"{{ ec2_region }}a" in create.elb.zones'
-          - '"{{ ec2_region }}b" in create.elb.zones'
+          - '"{{ aws_region }}a" in create.elb.zones'
+          - '"{{ aws_region }}b" in create.elb.zones'
           - create.elb.health_check.healthy_threshold == 10
           - create.elb.health_check.interval == 30
           - create.elb.health_check.target == "HTTP:80/index.html"
@@ -74,8 +74,8 @@
         that:
           - info.elbs|length == 1
           - elb.availability_zones|length == 2
-          - '"{{ ec2_region }}a" in elb.availability_zones'
-          - '"{{ ec2_region }}b" in elb.availability_zones'
+          - '"{{ aws_region }}a" in elb.availability_zones'
+          - '"{{ aws_region }}b" in elb.availability_zones'
           - elb.health_check.healthy_threshold == 10
           - elb.health_check.interval == 30
           - elb.health_check.target == "HTTP:80/index.html"
@@ -115,7 +115,7 @@
         name: "{{ elb_name }}"
         state: present
         zones:
-          - "{{ ec2_region }}c"
+          - "{{ aws_region }}c"
         listeners:
           - protocol: http
             load_balancer_port: 80
@@ -134,7 +134,7 @@
     - assert:
         that:
           - update_az is changed
-          - update_az.elb.zones[0] == "{{ ec2_region }}c"
+          - update_az.elb.zones[0] == "{{ aws_region }}c"
 
     - name: Get ELB info after changing AZ's
       elb_classic_lb_info:
@@ -144,7 +144,7 @@
     - assert:
         that:
           - elb.availability_zones|length == 1
-          - '"{{ ec2_region }}c" in elb.availability_zones[0]'
+          - '"{{ aws_region }}c" in elb.availability_zones[0]'
       vars:
         elb: "{{ info.elbs[0] }}"
 
@@ -157,9 +157,9 @@
         name: "{{ elb_name }}"
         state: present
         zones:
-          - "{{ ec2_region }}a"
-          - "{{ ec2_region }}b"
-          - "{{ ec2_region }}c"
+          - "{{ aws_region }}a"
+          - "{{ aws_region }}b"
+          - "{{ aws_region }}c"
         listeners:
           - protocol: http
             load_balancer_port: 80
@@ -170,9 +170,9 @@
     - assert:
         that:
           - update_az is changed
-          - '"{{ ec2_region }}a" in update_az.elb.zones'
-          - '"{{ ec2_region }}b" in update_az.elb.zones'
-          - '"{{ ec2_region }}c" in update_az.elb.zones'
+          - '"{{ aws_region }}a" in update_az.elb.zones'
+          - '"{{ aws_region }}b" in update_az.elb.zones'
+          - '"{{ aws_region }}c" in update_az.elb.zones'
 
     - name: Get ELB info after updating AZ's
       elb_classic_lb_info:
@@ -182,9 +182,9 @@
     - assert:
         that:
           - elb.availability_zones|length == 3
-          - '"{{ ec2_region }}a" in elb.availability_zones'
-          - '"{{ ec2_region }}b" in elb.availability_zones'
-          - '"{{ ec2_region }}c" in elb.availability_zones'
+          - '"{{ aws_region }}a" in elb.availability_zones'
+          - '"{{ aws_region }}b" in elb.availability_zones'
+          - '"{{ aws_region }}c" in elb.availability_zones'
       vars:
         elb: "{{ info.elbs[0] }}"
 
@@ -197,9 +197,9 @@
         name: "{{ elb_name }}"
         state: present
         zones:
-          - "{{ ec2_region }}a"
-          - "{{ ec2_region }}b"
-          - "{{ ec2_region }}c"
+          - "{{ aws_region }}a"
+          - "{{ aws_region }}b"
+          - "{{ aws_region }}c"
         listeners:
           - protocol: http
             load_balancer_port: 80
@@ -235,9 +235,9 @@
         name: "{{ elb_name }}"
         state: present
         zones:
-          - "{{ ec2_region }}a"
-          - "{{ ec2_region }}b"
-          - "{{ ec2_region }}c"
+          - "{{ aws_region }}a"
+          - "{{ aws_region }}b"
+          - "{{ aws_region }}c"
         listeners:
           - protocol: http
             load_balancer_port: 8081