diff --git a/keystonemiddleware/tests/unit/test_opts.py b/keystonemiddleware/tests/unit/test_opts.py
index 93e1b06e..8600278b 100644
--- a/keystonemiddleware/tests/unit/test_opts.py
+++ b/keystonemiddleware/tests/unit/test_opts.py
@@ -12,7 +12,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import pkg_resources
+import stevedore
 from testtools import matchers
 
 from keystonemiddleware import opts
@@ -74,12 +74,9 @@ class OptsTestCase(utils.TestCase):
         self._test_list_auth_token_opts(opts.list_auth_token_opts())
 
     def test_entry_point(self):
-        result = None
-        for ep in pkg_resources.iter_entry_points('oslo.config.opts'):
-            if ep.name == 'keystonemiddleware.auth_token':
-                list_fn = ep.load()
-                result = list_fn()
+        em = stevedore.ExtensionManager('oslo.config.opts',
+                                        invoke_on_load=True)
+        for extension in em:
+            if extension.name == 'keystonemiddleware.auth_token':
                 break
-
-        self.assertIsNotNone(result)
-        self._test_list_auth_token_opts(result)
+        self._test_list_auth_token_opts(extension.obj)
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index 9a33730f..8c54aaa1 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -13,6 +13,7 @@ oslotest>=1.5.1  # Apache-2.0
 oslo.messaging>=1.8.0  # Apache-2.0
 requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+stevedore>=1.3.0  # Apache-2.0
 testrepository>=0.0.18
 testresources>=0.2.4
 testtools>=0.9.36,!=1.2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index e36b86e3..c87974f5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -14,6 +14,7 @@ oslotest>=1.5.1  # Apache-2.0
 oslo.messaging>=1.8.0  # Apache-2.0
 requests-mock>=0.6.0  # Apache-2.0
 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
+stevedore>=1.3.0  # Apache-2.0
 testrepository>=0.0.18
 testresources>=0.2.4
 testtools>=0.9.36,!=1.2.0