diff --git a/test/integration/amazon.yml b/test/integration/amazon.yml
index c0fea475c92..a8931adf012 100644
--- a/test/integration/amazon.yml
+++ b/test/integration/amazon.yml
@@ -12,6 +12,7 @@
     #- { role: test_ec2_ami, tags: test_ec2_ami }
     #- { role: test_ec2, tags: test_ec2 }
     - { role: test_ec2_asg, tags: test_ec2_asg }
+    - { role: test_ec2_vpc_nat_gateway, tags: test_ec2_vpc_nat_gateway }
 
 # complex test for ec2_elb, split up over multiple plays
 # since there is a setup component as well as the test which
diff --git a/test/integrations/roles/ec2_vpc_nat_gateway/tasks/main.yml b/test/integration/roles/test_ec2_vpc_nat_gateway/tasks/main.yml
similarity index 100%
rename from test/integrations/roles/ec2_vpc_nat_gateway/tasks/main.yml
rename to test/integration/roles/test_ec2_vpc_nat_gateway/tasks/main.yml
diff --git a/test/integrations/group_vars/all.yml b/test/integration/roles/test_ec2_vpc_nat_gateway/vars/main.yml
similarity index 100%
rename from test/integrations/group_vars/all.yml
rename to test/integration/roles/test_ec2_vpc_nat_gateway/vars/main.yml