diff --git a/manifests/agents/ml2/sriov.pp b/manifests/agents/ml2/sriov.pp
index 9b25b43bb..f4138155b 100644
--- a/manifests/agents/ml2/sriov.pp
+++ b/manifests/agents/ml2/sriov.pp
@@ -89,10 +89,10 @@ class neutron::agents::ml2::sriov (
   }
 
   neutron_sriov_agent_config {
-    'sriov_nic/polling_interval':         value => $polling_interval;
     'sriov_nic/exclude_devices':          value => pick(join(any2array($exclude_devices), ','), $::os_service_default);
     'sriov_nic/physical_device_mappings': value => pick(join(any2array($physical_device_mappings), ','), $::os_service_default);
     'agent/extensions':                   value => join(any2array($extensions), ',');
+    'agent/polling_interval':             value => $polling_interval;
     # As of now security groups are not supported for SR-IOV ports.
     # It is required to disable Firewall driver in the SR-IOV agent config.
     'securitygroup/firewall_driver':      value => 'noop';
diff --git a/spec/classes/neutron_agents_ml2_sriov_spec.rb b/spec/classes/neutron_agents_ml2_sriov_spec.rb
index c1e78b107..37f5baabc 100644
--- a/spec/classes/neutron_agents_ml2_sriov_spec.rb
+++ b/spec/classes/neutron_agents_ml2_sriov_spec.rb
@@ -34,10 +34,10 @@ describe 'neutron::agents::ml2::sriov' do
     end
 
     it 'configures /etc/neutron/plugins/ml2/sriov_agent.ini' do
-      should contain_neutron_sriov_agent_config('sriov_nic/polling_interval').with_value(p[:polling_interval])
       should contain_neutron_sriov_agent_config('sriov_nic/exclude_devices').with_value('<SERVICE DEFAULT>')
       should contain_neutron_sriov_agent_config('sriov_nic/physical_device_mappings').with_value('<SERVICE DEFAULT>')
       should contain_neutron_sriov_agent_config('agent/extensions').with_value(['<SERVICE DEFAULT>'])
+      should contain_neutron_sriov_agent_config('agent/polling_interval').with_value(p[:polling_interval])
       should contain_neutron_sriov_agent_config('securitygroup/firewall_driver').with_value('noop')
     end