diff --git a/openstack/tests/ansible/roles/group/vars/main.yml b/openstack/tests/ansible/roles/group/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/group/vars/main.yml
rename to openstack/tests/ansible/roles/group/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/image/vars/main.yml b/openstack/tests/ansible/roles/image/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/image/vars/main.yml
rename to openstack/tests/ansible/roles/image/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/keypair/vars/main.yml b/openstack/tests/ansible/roles/keypair/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/keypair/vars/main.yml
rename to openstack/tests/ansible/roles/keypair/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/keystone_domain/vars/main.yml b/openstack/tests/ansible/roles/keystone_domain/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/keystone_domain/vars/main.yml
rename to openstack/tests/ansible/roles/keystone_domain/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/keystone_role/vars/main.yml b/openstack/tests/ansible/roles/keystone_role/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/keystone_role/vars/main.yml
rename to openstack/tests/ansible/roles/keystone_role/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/network/vars/main.yml b/openstack/tests/ansible/roles/network/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/network/vars/main.yml
rename to openstack/tests/ansible/roles/network/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/port/vars/main.yml b/openstack/tests/ansible/roles/port/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/port/vars/main.yml
rename to openstack/tests/ansible/roles/port/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/router/vars/main.yml b/openstack/tests/ansible/roles/router/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/router/vars/main.yml
rename to openstack/tests/ansible/roles/router/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/security_group/vars/main.yml b/openstack/tests/ansible/roles/security_group/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/security_group/vars/main.yml
rename to openstack/tests/ansible/roles/security_group/defaults/main.yml
diff --git a/openstack/tests/ansible/roles/server/vars/main.yaml b/openstack/tests/ansible/roles/server/defaults/main.yaml
similarity index 100%
rename from openstack/tests/ansible/roles/server/vars/main.yaml
rename to openstack/tests/ansible/roles/server/defaults/main.yaml
diff --git a/openstack/tests/ansible/roles/subnet/vars/main.yml b/openstack/tests/ansible/roles/subnet/defaults/main.yml
similarity index 100%
rename from openstack/tests/ansible/roles/subnet/vars/main.yml
rename to openstack/tests/ansible/roles/subnet/defaults/main.yml