diff --git a/babel.cfg b/babel.cfg
deleted file mode 100644
index 15cd6cb..0000000
--- a/babel.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[python: **.py]
-
diff --git a/openstack-common.conf b/openstack-common.conf
deleted file mode 100644
index 3d135be..0000000
--- a/openstack-common.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[DEFAULT]
-
-# The list of modules to copy from oslo-incubator.git
-
-# The base module to hold the copy of openstack.common
-base=os_performance_tools
diff --git a/os_performance_tools/collectors/mysql.py b/os_performance_tools/collectors/mysql.py
index 96d5f6e..5ad0765 100644
--- a/os_performance_tools/collectors/mysql.py
+++ b/os_performance_tools/collectors/mysql.py
@@ -19,11 +19,11 @@ be ignored by this module. Everything from the "client" section will be passed
 through to pymysql's connect method.
 '''
 
+import configparser
 import logging
 import os
 
 import pymysql
-from six.moves import configparser
 
 from os_performance_tools import error
 
diff --git a/os_performance_tools/collectors/queues.py b/os_performance_tools/collectors/queues.py
index 6c83101..83dcb23 100644
--- a/os_performance_tools/collectors/queues.py
+++ b/os_performance_tools/collectors/queues.py
@@ -25,13 +25,13 @@ so we strip that off.
 '''
 
 import base64
+import http.client as http_client
 import json
 import logging
 import os
 import re
 import socket
 
-from six.moves import http_client
 
 from os_performance_tools import error
 
diff --git a/os_performance_tools/tests/test_collect.py b/os_performance_tools/tests/test_collect.py
index 30e259b..06c8322 100644
--- a/os_performance_tools/tests/test_collect.py
+++ b/os_performance_tools/tests/test_collect.py
@@ -17,13 +17,13 @@ test_collect
 Tests for `os_performance_tools.collect`
 """
 
+import io
 import json
 import mock
 import tempfile
 
 from os_performance_tools import collect
 from os_performance_tools.tests import base
-import six
 import subunit
 import testtools
 
@@ -45,7 +45,7 @@ class TestCollect(base.TestCase):
 
     def setUp(self):
         super(TestCollect, self).setUp()
-        self.stdout = six.BytesIO()
+        self.stdout = io.BytesIO()
         self.attachments = []
 
     @mock.patch('os_performance_tools.collectors.mysql.collect')
diff --git a/os_performance_tools/tests/test_queues.py b/os_performance_tools/tests/test_queues.py
index e3a5e75..9324b85 100644
--- a/os_performance_tools/tests/test_queues.py
+++ b/os_performance_tools/tests/test_queues.py
@@ -26,7 +26,7 @@ from os_performance_tools.tests import base
 
 class TestOpenStackQaTols(base.TestCase):
 
-    @mock.patch('six.moves.http_client.HTTPConnection')
+    @mock.patch('http.client.HTTPConnection')
     def test_queues(self, httplib_mock):
         reader = mock.MagicMock(name='getresponse_reader')
         rval = json.dumps([{'name': 'foo', 'message_stats': {'publish': 1}}])
diff --git a/requirements.txt b/requirements.txt
index a8f65ea..2fa0d0d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
+pbr>=2.0,!=2.1.0
 PyMySQL>=0.6.2  # MIT License
 statsd>=1.0.0
 oslo.config>=1.4.0.0a3
diff --git a/test-requirements.txt b/test-requirements.txt
index af36dd8..fa609b1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking<3.1.0,>=3.0.1
+hacking<3.2.0,>=3.1.0
 
 coverage>=3.6
 python-subunit>=0.0.18