diff --git a/neutron/opts.py b/neutron/opts.py
index 23e47962b7c..ac7d2386365 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -280,7 +280,7 @@ def list_ovs_opts():
 
 def list_sriov_agent_opts():
     return [
-        ('ml2_sriov',
+        ('sriov_nic',
          neutron.plugins.ml2.drivers.mech_sriov.agent.common.config.
          sriov_nic_opts),
         ('agent',
diff --git a/neutron/tests/unit/test_opts.py b/neutron/tests/unit/test_opts.py
new file mode 100644
index 00000000000..cc7be20079f
--- /dev/null
+++ b/neutron/tests/unit/test_opts.py
@@ -0,0 +1,24 @@
+# Copyright (c) 2016 OpenStack Foundation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+from neutron import opts
+from neutron.tests import base
+
+
+class OptsTestCase(base.BaseTestCase):
+
+    def test_list_sriov_agent_opts(self):
+        self.assertEqual('sriov_nic', opts.list_sriov_agent_opts()[0][0])