diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml
index 905ab72dab..626312771c 100644
--- a/cinder/templates/configmap-etc.yaml
+++ b/cinder/templates/configmap-etc.yaml
@@ -72,7 +72,7 @@ metadata:
   name: cinder-etc
 data:
   rally_tests.yaml: |+
-{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
   cinder.conf: |+
 {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | indent 4 }}
   backends.conf: |+
diff --git a/cinder/templates/etc/_rally_tests.yaml.tpl b/cinder/templates/etc/_rally_tests.yaml.tpl
deleted file mode 100644
index e18fe1a021..0000000000
--- a/cinder/templates/etc/_rally_tests.yaml.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
----
-CinderVolumes.create_and_delete_volume:
-- args:
-    size: 1
-  runner:
-    type: "constant"
-    times: 1
-    concurrency: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  sla:
-    failure_rate:
-      max: 0
-- args:
-    size:
-      min: 1
-      max: 5
-  runner:
-    type: "constant"
-    times: 1
-    concurrency: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  sla:
-    failure_rate:
-      max: 0
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 235ad48fe2..9c1830f13b 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -404,8 +404,36 @@ conf:
       rbd_user: "admin"
   rally_tests:
     run_tempest: false
-    override:
-    append:
+    tests:
+      CinderVolumes.create_and_delete_volume:
+        - args:
+            size: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+        - args:
+            size:
+              max: 5
+              min: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
 
 dependencies:
   db_init:
diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml
index 000178b4fe..4f1c2a0545 100644
--- a/glance/templates/configmap-etc.yaml
+++ b/glance/templates/configmap-etc.yaml
@@ -145,7 +145,7 @@ metadata:
   name: glance-etc
 data:
   rally_tests.yaml: |+
-{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
   glance-api.conf: |+
 {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | indent 4 }}
   glance-api-paste.ini: |+
diff --git a/glance/templates/etc/_rally_tests.yaml.tpl b/glance/templates/etc/_rally_tests.yaml.tpl
deleted file mode 100644
index 23fc7bb17f..0000000000
--- a/glance/templates/etc/_rally_tests.yaml.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
----
-GlanceImages.create_and_delete_image:
-- args:
-    container_format: {{ .Values.conf.rally_tests.images.container_format }}
-    disk_format: {{ .Values.conf.rally_tests.images.disk_format }}
-    image_location: {{ .Values.conf.rally_tests.images.image_location }}
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-GlanceImages.create_and_list_image:
-- args:
-    container_format: {{ .Values.conf.rally_tests.images.container_format }}
-    disk_format: {{ .Values.conf.rally_tests.images.disk_format }}
-    image_location: {{ .Values.conf.rally_tests.images.image_location }}
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
diff --git a/glance/values.yaml b/glance/values.yaml
index c9fd1a8f89..ab10b02863 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -61,12 +61,39 @@ bootstrap:
 conf:
   rally_tests:
     run_tempest: false
-    override:
-    append:
-    images:
-      image_location: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
-      disk_format: qcow2
-      container_format: bare
+    tests:
+      GlanceImages.create_and_delete_image:
+        - args:
+            container_format: bare
+            disk_format: qcow2
+            image_location: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      GlanceImages.create_and_list_image:
+        - args:
+            container_format: bare
+            disk_format: qcow2
+            image_location: http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
   ceph:
     monitors: []
     admin_keyring: null
diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml
index 307c07532a..1352b0758b 100644
--- a/neutron/templates/configmap-etc.yaml
+++ b/neutron/templates/configmap-etc.yaml
@@ -95,7 +95,7 @@ metadata:
   name: neutron-etc
 data:
   rally_tests.yaml: |+
-{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
   api-paste.ini: |+
 {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
   policy.json: |+
diff --git a/neutron/templates/etc/_rally_tests.yaml.tpl b/neutron/templates/etc/_rally_tests.yaml.tpl
deleted file mode 100644
index 88f3651b96..0000000000
--- a/neutron/templates/etc/_rally_tests.yaml.tpl
+++ /dev/null
@@ -1,295 +0,0 @@
----
-NeutronNetworks.create_and_delete_networks:
-- args:
-    network_create_args: {}
-  context:
-    quotas:
-      neutron:
-        network: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_delete_ports:
-- args:
-    network_create_args: {}
-    port_create_args: {}
-    ports_per_network: 10
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        port: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_delete_routers:
-- args:
-    network_create_args: {}
-    router_create_args: {}
-    subnet_cidr_start: 1.1.0.0/30
-    subnet_create_args: {}
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        router: -1
-        subnet: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_delete_subnets:
-- args:
-    network_create_args: {}
-    subnet_cidr_start: 1.1.0.0/30
-    subnet_create_args: {}
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        subnet: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_list_routers:
-- args:
-    network_create_args: {}
-    router_create_args: {}
-    subnet_cidr_start: 1.1.0.0/30
-    subnet_create_args: {}
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        router: -1
-        subnet: -1
-    users:
-      tenants: 3
-      users_per_tenant: 3
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_list_subnets:
-- args:
-    network_create_args: {}
-    subnet_cidr_start: 1.1.0.0/30
-    subnet_create_args: {}
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        subnet: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_show_network:
-- args:
-    network_create_args: {}
-  context:
-    quotas:
-      neutron:
-        network: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_update_networks:
-- args:
-    network_create_args: {}
-    network_update_args:
-      admin_state_up: false
-      name: _updated
-  context:
-    quotas:
-      neutron:
-        network: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_update_ports:
-- args:
-    network_create_args: {}
-    port_create_args: {}
-    port_update_args:
-      admin_state_up: false
-      device_id: dummy_id
-      device_owner: dummy_owner
-      name: _port_updated
-    ports_per_network: 5
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        port: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_update_routers:
-- args:
-    network_create_args: {}
-    router_create_args: {}
-    router_update_args:
-      admin_state_up: false
-      name: _router_updated
-    subnet_cidr_start: 1.1.0.0/30
-    subnet_create_args: {}
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        router: -1
-        subnet: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.create_and_update_subnets:
-- args:
-    network_create_args: {}
-    subnet_cidr_start: 1.4.0.0/16
-    subnet_create_args: {}
-    subnet_update_args:
-      enable_dhcp: false
-      name: _subnet_updated
-    subnets_per_network: 2
-  context:
-    network: {}
-    quotas:
-      neutron:
-        network: -1
-        subnet: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronNetworks.list_agents:
-- args:
-    agent_args: {}
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronSecurityGroup.create_and_list_security_groups:
-- args:
-    security_group_create_args: {}
-  context:
-    quotas:
-      neutron:
-        security_group: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NeutronSecurityGroup.create_and_update_security_groups:
-- args:
-    security_group_create_args: {}
-    security_group_update_args: {}
-  context:
-    quotas:
-      neutron:
-        security_group: -1
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
diff --git a/neutron/values.yaml b/neutron/values.yaml
index c36b68ced8..f2759843af 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -384,8 +384,301 @@ pod:
 conf:
   rally_tests:
     run_tempest: false
-    override:
-    append:
+    tests:
+      NeutronNetworks.create_and_delete_networks:
+        - args:
+            network_create_args: {}
+          context:
+            quotas:
+              neutron:
+                network: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_delete_ports:
+        - args:
+            network_create_args: {}
+            port_create_args: {}
+            ports_per_network: 10
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                port: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_delete_routers:
+        - args:
+            network_create_args: {}
+            router_create_args: {}
+            subnet_cidr_start: 1.1.0.0/30
+            subnet_create_args: {}
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                router: -1
+                subnet: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_delete_subnets:
+        - args:
+            network_create_args: {}
+            subnet_cidr_start: 1.1.0.0/30
+            subnet_create_args: {}
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                subnet: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_list_routers:
+        - args:
+            network_create_args: {}
+            router_create_args: {}
+            subnet_cidr_start: 1.1.0.0/30
+            subnet_create_args: {}
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                router: -1
+                subnet: -1
+            users:
+              tenants: 3
+              users_per_tenant: 3
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_list_subnets:
+        - args:
+            network_create_args: {}
+            subnet_cidr_start: 1.1.0.0/30
+            subnet_create_args: {}
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                subnet: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_show_network:
+        - args:
+            network_create_args: {}
+          context:
+            quotas:
+              neutron:
+                network: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_update_networks:
+        - args:
+            network_create_args: {}
+            network_update_args:
+              admin_state_up: false
+              name: _updated
+          context:
+            quotas:
+              neutron:
+                network: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_update_ports:
+        - args:
+            network_create_args: {}
+            port_create_args: {}
+            port_update_args:
+              admin_state_up: false
+              device_id: dummy_id
+              device_owner: dummy_owner
+              name: _port_updated
+            ports_per_network: 5
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                port: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_update_routers:
+        - args:
+            network_create_args: {}
+            router_create_args: {}
+            router_update_args:
+              admin_state_up: false
+              name: _router_updated
+            subnet_cidr_start: 1.1.0.0/30
+            subnet_create_args: {}
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                router: -1
+                subnet: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.create_and_update_subnets:
+        - args:
+            network_create_args: {}
+            subnet_cidr_start: 1.4.0.0/16
+            subnet_create_args: {}
+            subnet_update_args:
+              enable_dhcp: false
+              name: _subnet_updated
+            subnets_per_network: 2
+          context:
+            network: {}
+            quotas:
+              neutron:
+                network: -1
+                subnet: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronNetworks.list_agents:
+        - args:
+            agent_args: {}
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronSecurityGroup.create_and_list_security_groups:
+        - args:
+            security_group_create_args: {}
+          context:
+            quotas:
+              neutron:
+                security_group: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NeutronSecurityGroup.create_and_update_security_groups:
+        - args:
+            security_group_create_args: {}
+            security_group_update_args: {}
+          context:
+            quotas:
+              neutron:
+                security_group: -1
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
   paste:
     composite:neutron:
       use: egg:Paste#urlmap
diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml
index 496331d8ab..bb1d3dd61b 100644
--- a/nova/templates/configmap-etc.yaml
+++ b/nova/templates/configmap-etc.yaml
@@ -20,8 +20,6 @@ limitations under the License.
 {{- if empty .Values.conf.nova.keystone_authtoken.auth_uri -}}
 {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken "auth_uri" | quote | trunc 0 -}}
 {{- end -}}
-
-# FIXME(alanmeadows) fix for broken keystonemiddleware oslo config gen in newton - will remove in future
 {{- if empty .Values.conf.nova.keystone_authtoken.auth_url -}}
 {{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.nova.keystone_authtoken "auth_url" | quote | trunc 0 -}}
 {{- end -}}
@@ -116,7 +114,7 @@ metadata:
   name: nova-etc
 data:
   rally_tests.yaml: |+
-{{- tuple .Values.conf.rally_tests "etc/_rally_tests.yaml.tpl" . | include "helm-toolkit.utils.configmap_templater" }}
+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }}
   api-paste.ini: |+
 {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | indent 4 }}
   policy.yaml: |+
diff --git a/nova/templates/etc/_rally_tests.yaml.tpl b/nova/templates/etc/_rally_tests.yaml.tpl
deleted file mode 100644
index 75a5e34821..0000000000
--- a/nova/templates/etc/_rally_tests.yaml.tpl
+++ /dev/null
@@ -1,323 +0,0 @@
----
-NovaAgents.list_agents:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaAggregates.create_and_get_aggregate_details:
-- args:
-    availability_zone: nova
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaAggregates.create_and_update_aggregate:
-- args:
-    availability_zone: nova
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaAggregates.list_aggregates:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaAvailabilityZones.list_availability_zones:
-- args:
-    detailed: true
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.create_and_delete_flavor:
-- args:
-    disk: 1
-    ram: 500
-    vcpus: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.create_and_list_flavor_access:
-- args:
-    disk: 1
-    ram: 500
-    vcpus: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.create_flavor:
-- args:
-    disk: 1
-    ram: 500
-    vcpus: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.create_flavor_and_add_tenant_access:
-- args:
-    disk: 1
-    ram: 500
-    vcpus: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.create_flavor_and_set_keys:
-- args:
-    disk: 1
-    extra_specs:
-      quota:disk_read_bytes_sec: 10240
-    ram: 500
-    vcpus: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaFlavors.list_flavors:
-- args:
-    detailed: true
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHosts.list_hosts:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHypervisors.list_and_get_hypervisors:
-- args:
-    detailed: true
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHypervisors.list_and_get_uptime_hypervisors:
-- args:
-    detailed: true
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHypervisors.list_and_search_hypervisors:
-- args:
-    detailed: true
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHypervisors.list_hypervisors:
-- args:
-    detailed: true
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaHypervisors.statistics_hypervisors:
-- args: {}
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaImages.list_images:
-- args:
-    detailed: true
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaKeypair.create_and_delete_keypair:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaKeypair.create_and_list_keypairs:
-- context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaSecGroup.create_and_delete_secgroups:
-- args:
-    rules_per_security_group: 1
-    security_group_count: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaSecGroup.create_and_list_secgroups:
-- args:
-    rules_per_security_group: 1
-    security_group_count: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaSecGroup.create_and_update_secgroups:
-- args:
-    security_group_count: 1
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaServerGroups.create_and_list_server_groups:
-- args:
-    all_projects: false
-    kwargs:
-      policies:
-      - affinity
-  context:
-    users:
-      tenants: 1
-      users_per_tenant: 1
-  runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
-NovaServices.list_services:
-- runner:
-    concurrency: 1
-    times: 1
-    type: constant
-  sla:
-    failure_rate:
-      max: 0
diff --git a/nova/values.yaml b/nova/values.yaml
index f2ea8750cf..95c887ff60 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -277,8 +277,329 @@ conf:
     append:
   rally_tests:
     run_tempest: false
-    override:
-    append:
+    tests:
+      NovaAgents.list_agents:
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaAggregates.create_and_get_aggregate_details:
+        - args:
+            availability_zone: nova
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaAggregates.create_and_update_aggregate:
+        - args:
+            availability_zone: nova
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaAggregates.list_aggregates:
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaAvailabilityZones.list_availability_zones:
+        - args:
+            detailed: true
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.create_and_delete_flavor:
+        - args:
+            disk: 1
+            ram: 500
+            vcpus: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.create_and_list_flavor_access:
+        - args:
+            disk: 1
+            ram: 500
+            vcpus: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.create_flavor:
+        - args:
+            disk: 1
+            ram: 500
+            vcpus: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.create_flavor_and_add_tenant_access:
+        - args:
+            disk: 1
+            ram: 500
+            vcpus: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.create_flavor_and_set_keys:
+        - args:
+            disk: 1
+            extra_specs:
+              'quota:disk_read_bytes_sec': 10240
+            ram: 500
+            vcpus: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaFlavors.list_flavors:
+        - args:
+            detailed: true
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHosts.list_hosts:
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHypervisors.list_and_get_hypervisors:
+        - args:
+            detailed: true
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHypervisors.list_and_get_uptime_hypervisors:
+        - args:
+            detailed: true
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHypervisors.list_and_search_hypervisors:
+        - args:
+            detailed: true
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHypervisors.list_hypervisors:
+        - args:
+            detailed: true
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaHypervisors.statistics_hypervisors:
+        - args: {}
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaImages.list_images:
+        - args:
+            detailed: true
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaKeypair.create_and_delete_keypair:
+        - context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaKeypair.create_and_list_keypairs:
+        - context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaSecGroup.create_and_delete_secgroups:
+        - args:
+            rules_per_security_group: 1
+            security_group_count: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaSecGroup.create_and_list_secgroups:
+        - args:
+            rules_per_security_group: 1
+            security_group_count: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaSecGroup.create_and_update_secgroups:
+        - args:
+            security_group_count: 1
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaServerGroups.create_and_list_server_groups:
+        - args:
+            all_projects: false
+            kwargs:
+              policies:
+                - affinity
+          context:
+            users:
+              tenants: 1
+              users_per_tenant: 1
+          runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
+      NovaServices.list_services:
+        - runner:
+            concurrency: 1
+            times: 1
+            type: constant
+          sla:
+            failure_rate:
+              max: 0
   paste:
     composite:metadata:
       use: egg:Paste#urlmap