diff --git a/acceptance/openstack/identity_test.go b/acceptance/openstack/identity/v2/identity_test.go
similarity index 100%
rename from acceptance/openstack/identity_test.go
rename to acceptance/openstack/identity/v2/identity_test.go
diff --git a/acceptance/openstack/storage_test.go b/acceptance/openstack/storage/v1/storage_test.go
similarity index 100%
rename from acceptance/openstack/storage_test.go
rename to acceptance/openstack/storage/v1/storage_test.go