diff --git a/rally-jobs/rally-keystone-api-v2.yaml b/rally-jobs/rally-keystone-api-v2.yaml
index 864615d7..3643f1ce 100644
--- a/rally-jobs/rally-keystone-api-v2.yaml
+++ b/rally-jobs/rally-keystone-api-v2.yaml
@@ -650,27 +650,27 @@
         failure_rate:
           max: 0
 
-  GlanceImages.create_image_and_boot_instances:
-    -
-      args:
-        image_location: "{{ cirros_image_url }}"
-        container_format: "bare"
-        disk_format: "qcow2"
-        flavor:
-            name: "m1.tiny"
-        number_instances: 2
-      runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-
+#  GlanceImages.create_image_and_boot_instances:
+#    -
+#      args:
+#        image_location: "{{ cirros_image_url }}"
+#        container_format: "bare"
+#        disk_format: "qcow2"
+#        flavor:
+#            name: "m1.tiny"
+#        number_instances: 2
+#      runner:
+#        type: "constant"
+#        times: 1
+#        concurrency: 1
+#      context:
+#        users:
+#          tenants: 3
+#          users_per_tenant: 1
+#      sla:
+#        failure_rate:
+#          max: 0
+#
   SwiftObjects.create_container_and_object_then_list_objects:
     -
       args:
@@ -728,38 +728,6 @@
         failure_rate:
           max: 0
 
-  NovaNetworks.create_and_list_networks:
-    -
-      args:
-        start_cidr: "10.10.0.0/24"
-      runner:
-        type: "constant"
-        times: 5
-        concurrency: 2
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  NovaNetworks.create_and_delete_network:
-    -
-      args:
-        start_cidr: "10.10.0.0/24"
-      runner:
-        type: "constant"
-        times: 5
-        concurrency: 2
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
   SwiftObjects.list_and_download_objects_in_containers:
     -
       runner:
diff --git a/rally-jobs/rally.yaml b/rally-jobs/rally.yaml
index 457d28ee..ed49304a 100644
--- a/rally-jobs/rally.yaml
+++ b/rally-jobs/rally.yaml
@@ -1050,38 +1050,6 @@
         failure_rate:
           max: 0
 
-  NovaNetworks.create_and_list_networks:
-    -
-      args:
-        start_cidr: "10.10.0.0/24"
-      runner:
-        type: "constant"
-        times: 5
-        concurrency: 2
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
-  NovaNetworks.create_and_delete_network:
-    -
-      args:
-        start_cidr: "10.10.0.0/24"
-      runner:
-        type: "constant"
-        times: 5
-        concurrency: 2
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 2
-      sla:
-        failure_rate:
-          max: 0
-
   SwiftObjects.list_and_download_objects_in_containers:
     -
       runner:
diff --git a/test-requirements.txt b/test-requirements.txt
index 1dfba833..981425b0 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -23,3 +23,6 @@ testtools>=1.4.0
 
 oslosphinx>=4.7.0                                      # Apache Software License
 oslotest>=1.10.0                                       # Apache Software License
+
+testresources>=0.2.4                                   # Apache-2.0/BSD
+testscenarios>=0.4                                     # Apache-2.0/BSD
diff --git a/tests/ci/rally_gate_functions.sh b/tests/ci/rally_gate_functions.sh
index a1b50253..8d687c80 100644
--- a/tests/ci/rally_gate_functions.sh
+++ b/tests/ci/rally_gate_functions.sh
@@ -37,13 +37,18 @@ function setUp () {
     # NOTE(ikhudoshyn): Create additional users and register a new env
     # so that we could run scenarios using 'existing_users' context
     if [ "$DEVSTACK_GATE_PREPOPULATE_USERS" = "1" ]; then
+        # NOTE(andreykurilin): let's hardcode version, since we already
+        #    hardcoded arguments for users...
+        export OS_IDENTITY_API_VERSION=3
         openstack --version
 
-        openstack --os-interface admin project create rally-test-project-1
-        openstack --os-interface admin user create --project rally-test-project-1 --password rally-test-password-1 rally-test-user-1
+        openstack project create rally-test-project-1
+        openstack user create --project rally-test-project-1 --password rally-test-password-1 rally-test-user-1
+        openstack role add --project rally-test-project-1 --user rally-test-user-1 Member
 
-        openstack --os-interface admin project create rally-test-project-2
-        openstack --os-interface admin user create --project rally-test-project-2 --password rally-test-password-2 rally-test-user-2
+        openstack project create rally-test-project-2
+        openstack user create --project rally-test-project-2 --password rally-test-password-2 rally-test-user-2
+        openstack role add --project rally-test-project-2 --user rally-test-user-2 Member
 
         set +e
         NEUTRON_EXISTS=$(openstack --os-interface admin service list | grep neutron)
@@ -63,12 +68,16 @@ function setUp () {
           {\
               "username": "rally-test-user-1",\
               "password": "rally-test-password-1",\
-              "tenant_name": "rally-test-project-1",\
+              "project_name": "rally-test-project-1",\
+              "user_domain_name": "Default",\
+              "project_domain_name": "Default"\
           },\
           {\
               "username": "rally-test-user-2",\
               "password": "rally-test-password-2",\
-              "tenant_name": "rally-test-project-2"\
+              "project_name": "rally-test-project-2",\
+              "user_domain_name": "Default",\
+              "project_domain_name": "Default"\
           }\
         ],\
     ' $DEPLOYMENT_CONFIG_FILE