diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 971915e9..e18068a6 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -214,9 +214,8 @@ function setup_localrc {
         local original_enabled_services=$MY_ENABLED_SERVICES
 
         # TODO(afazekas): Move to the feature grid
-        # TODO(afazekas): add c-vol
         if [[ $role = sub ]]; then
-            MY_ENABLED_SERVICES="n-cpu,ceilometer-acompute,dstat"
+            MY_ENABLED_SERVICES="n-cpu,ceilometer-acompute,dstat,c-vol,c-bak"
             if [[ "$DEVSTACK_GATE_NEUTRON" -eq "1" ]]; then
                 MY_ENABLED_SERVICES+=",q-agt"
                 if [[ "$DEVSTACK_GATE_NEUTRON_DVR" -eq "1" ]]; then
diff --git a/features.yaml b/features.yaml
index 9f300052..27fa9fc5 100644
--- a/features.yaml
+++ b/features.yaml
@@ -47,6 +47,8 @@ config:
     features: [heat]
   tlsproxy:
     features: [tlsproxy]
+  cinder_mn_grenade:
+    features: [cinder-mn-grenade]
 
 branches:
   # The value of ""default" is the name of the "trunk" branch
@@ -110,6 +112,12 @@ features:
     base:
       services: [cinder, c-api, c-vol, c-sch, c-bak]
 
+  # This will be used to disable c-vol on primary node when running multinode grenade
+  # job that will test compatibility of new c-api, c-sch (primary) and old c-vol and c-bak (sub).
+  cinder-mn-grenade:
+    base:
+      rm-services: [c-vol, c-bak]
+
   heat:
     base:
       services: [heat, h-api, h-api-cfn, h-api-cw, h-eng]