diff --git a/octane/tests/conftest.py b/octane/tests/conftest.py
index 9e721966..8bfcd85f 100644
--- a/octane/tests/conftest.py
+++ b/octane/tests/conftest.py
@@ -28,6 +28,10 @@ class SafeOctaneApp(app.OctaneApp):
         parser.set_defaults(debug=True)
         return parser
 
+    def get_fuzzy_matches(self, cmd):
+        # Turn off guessing, we need exact failures in tests
+        return []
+
     def run(self, argv):
         try:
             exit_code = super(SafeOctaneApp, self).run(argv)
diff --git a/requirements.txt b/requirements.txt
index 9782decf..052f375c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # NOTE: These requirements *must* match those of libs installed on Fuel master
 # To verify them, use command like "rpm -q --whatrequires python-cliff" and
 # examine requirements of software listed there.
-pbr>=0.6,!=0.7,<1.0
+pbr>=1.6
 
 python-fuelclient  # It pulls following libs:
 #cliff
diff --git a/setup.cfg b/setup.cfg
index fb49dad0..49597725 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -23,11 +23,9 @@ classifier =
 packages =
     octane
 
-# NOTE(akscram): The extras section properly handled in pbr>=1.0.0 and
-#                represents the extras_require parameter.
-# [extras]
-# zabbix =
-#     pyzabbix==0.7.3
+[extras]
+zabbix =
+    pyzabbix==0.7.3
 
 [entry_points]
 console_scripts =