diff --git a/setup.cfg b/setup.cfg
index 213a91fa1..ccc800dfa 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -78,9 +78,9 @@ database =
 test =
   zake>=0.1.6 # Apache-2.0
   pydotplus>=2.0.2 # MIT License
-  hacking<0.11,>=0.10.0
+  hacking<6.2.0,>=6.1.0
   oslotest>=3.2.0 # Apache-2.0
-  mock>=2.0.0 # BSD
   testtools>=2.2.0 # MIT
   testscenarios>=0.4 # Apache-2.0/BSD
   stestr>=2.0.0 # Apache-2.0
+  pifpaf>=0.10.0 # Apache-2.0