diff --git a/rally-jobs/rally-neutron-existing-users.yaml b/rally-jobs/rally-neutron-existing-users.yaml
index 02c36c1a..5668694a 100644
--- a/rally-jobs/rally-neutron-existing-users.yaml
+++ b/rally-jobs/rally-neutron-existing-users.yaml
@@ -115,135 +115,6 @@
         failure_rate:
           max: 20
 
-  # TODO(ikhudoshyn): We need to setup 'pool'
-  # quota properly in rally-gate.sh in order to run it
-  #
-  #NeutronLoadbalancerV1.create_and_list_pools:
-    #-
-      #args:
-        #pool_create_args: {}
-      #runner:
-        #type: "constant"
-        #times: {{smoke or 20}}
-        #concurrency: {{smoke or 10}}
-      #context:
-        #network: {}
-        #lbaas:
-          #pool: {}
-          #lbaas_version: 1
-      #sla:
-        #failure_rate:
-          #max: 0
-
-  # TODO(ikhudoshyn): We need to setup 'pool'
-  # quota properly in rally-gate.sh in order to run it
-  #
-  #NeutronLoadbalancerV1.create_and_delete_pools:
-    #-
-      #args:
-        #pool_create_args: {}
-      #runner:
-        #type: "constant"
-        #times: {{smoke or 20}}
-        #concurrency: {{smoke or 10}}
-      #context:
-        #network: {}
-      #sla:
-        #failure_rate:
-          #max: 0
-
-  # TODO(ikhudoshyn): We need to setup 'pool'
-  # quota properly in rally-gate.sh in order to run it
-  #
-  #NeutronLoadbalancerV1.create_and_update_pools:
-    #-
-      #args:
-        #pool_create_args: {}
-        #pool_update_args: {}
-      #runner:
-        #type: "constant"
-        #times: {{smoke or 20}}
-        #concurrency: {{smoke or 10}}
-      #context:
-        #network: {}
-      #sla:
-        #failure_rate:
-          #max: 0
-
-  # TODO(ikhudoshyn): We need to setup 'pool'
-  # quota properly in rally-gate.sh in order to run it
-  #
-  #NeutronLoadbalancerV1.create_and_list_vips:
-    #-
-      #args:
-        #vip_create_args: {}
-      #runner:
-        #type: "constant"
-        #times: {{smoke or 20}}
-        #concurrency: {{smoke or 10}}
-      #context:
-        #network: {}
-      #sla:
-        #failure_rate:
-          #max: 0
-
-  # TODO(ikhudoshyn): We need to setup 'pool'
-  # quota properly in rally-gate.sh in order to run it
-  #
-  #NeutronLoadbalancerV1.create_and_update_vips:
-    #-
-      #args:
-        #vip_create_args: {}
-        #vip_update_args: {}
-        #pool_create_args: {}
-      #runner:
-        #type: "constant"
-        #times: {{smoke or 20}}
-        #concurrency: {{smoke or 10}}
-      #context:
-        #network: {}
-      #sla:
-        #failure_rate:
-          #max: 0
-
-  NeutronLoadbalancerV1.create_and_list_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_delete_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_update_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-        healthmonitor_update_args:
-          admin_state_up: False
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      sla:
-        failure_rate:
-          max: 0
-
   NeutronNetworks.create_and_update_networks:
     -
       args:
diff --git a/rally-jobs/rally-neutron.yaml b/rally-jobs/rally-neutron.yaml
index fc9ab957..93bd3e9f 100644
--- a/rally-jobs/rally-neutron.yaml
+++ b/rally-jobs/rally-neutron.yaml
@@ -174,183 +174,6 @@
         failure_rate:
           max: 20
 
-  NeutronLoadbalancerV1.create_and_list_pools:
-    -
-      args:
-        pool_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 3}}
-          users_per_tenant: {{smoke or 2}}
-        network: {}
-        lbaas:
-          pool: {}
-          lbaas_version: 1
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            pool: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_delete_pools:
-    -
-      args:
-        pool_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 3}}
-          users_per_tenant: {{smoke or 2}}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            pool: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_update_pools:
-    -
-      args:
-        pool_create_args: {}
-        pool_update_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 3}}
-          users_per_tenant: {{smoke or 2}}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            pool: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_list_vips:
-    -
-      args:
-        vip_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 5}}
-          users_per_tenant: {{smoke or 4}}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            pool: -1
-            vip: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_update_vips:
-    -
-      args:
-        vip_create_args: {}
-        vip_update_args: {}
-        pool_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 5}}
-          users_per_tenant: {{smoke or 2}}
-        network: {}
-        quotas:
-          neutron:
-            network: -1
-            subnet: -1
-            pool: -1
-            vip: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_list_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 5}}
-          users_per_tenant: {{smoke or 2}}
-        quotas:
-          neutron:
-            health_monitor: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_delete_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 5}}
-          users_per_tenant: {{smoke or 2}}
-        quotas:
-          neutron:
-            health_monitor: -1
-      sla:
-        failure_rate:
-          max: 0
-
-  NeutronLoadbalancerV1.create_and_update_healthmonitors:
-    -
-      args:
-        healthmonitor_create_args: {}
-        healthmonitor_update_args:
-          admin_state_up: False
-      runner:
-        type: "constant"
-        times: {{smoke or 20}}
-        concurrency: {{smoke or 10}}
-      context:
-        users:
-          tenants: {{smoke or 5}}
-          users_per_tenant: {{smoke or 2}}
-        quotas:
-          neutron:
-            health_monitor: -1
-      sla:
-        failure_rate:
-          max: 0
-
   NeutronNetworks.create_and_update_networks:
     -
       args:
diff --git a/tests/ci/rally-gate.sh b/tests/ci/rally-gate.sh
index cf5264fa..f7548161 100755
--- a/tests/ci/rally-gate.sh
+++ b/tests/ci/rally-gate.sh
@@ -69,11 +69,11 @@ if [ "$DEVSTACK_GATE_PREPOPULATE_USERS" = "1" ]; then
     NEUTRON_EXISTS=$(openstack --os-interface admin service list | grep neutron)
     set -e
     if [ "$NEUTRON_EXISTS" ]; then
-        OS_QUOTA_STR="--networks -1 --subnets -1 --routers -1 --vips -1 --floating-ips -1 --subnetpools -1 --secgroups -1 --secgroup-rules -1 --ports -1 --health-monitors -1"
-        openstack --os-interface admin quota set $OS_QUOTA_STR rally-test-project-1 
-        openstack --os-interface admin quota show rally-test-project-1 
-        openstack --os-interface admin quota set $OS_QUOTA_STR rally-test-project-2 
-        openstack --os-interface admin quota show rally-test-project-2 
+        OS_QUOTA_STR="--networks -1 --subnets -1 --routers -1 --floating-ips -1 --subnetpools -1 --secgroups -1 --secgroup-rules -1 --ports -1"
+        openstack --os-interface admin quota set $OS_QUOTA_STR rally-test-project-1
+        openstack --os-interface admin quota show rally-test-project-1
+        openstack --os-interface admin quota set $OS_QUOTA_STR rally-test-project-2
+        openstack --os-interface admin quota show rally-test-project-2
     fi
 
     DEPLOYMENT_CONFIG_FILE=~/.rally/with-existing-users-config