diff --git a/keystoneclient/tests/unit/test_base.py b/keystoneclient/tests/unit/test_base.py
index bd5deb7c5..ca57dc469 100644
--- a/keystoneclient/tests/unit/test_base.py
+++ b/keystoneclient/tests/unit/test_base.py
@@ -319,7 +319,7 @@ class ManagerRequestIdTest(utils.TestCase):
         delete_mock.assert_called_once_with('/test-url', name='hello')
         self.assertEqual(base_resp.request_ids[0], TEST_REQUEST_ID)
         self.assertEqual(base_resp.data, None)
-        self.assertTrue(isinstance(resp, requests.Response))
+        self.assertIsInstance(resp, requests.Response)
 
     def test_patch(self):
         body = {"hello": {"hi": 1}}
diff --git a/keystoneclient/tests/unit/v3/utils.py b/keystoneclient/tests/unit/v3/utils.py
index 8b1549113..cb3839a9c 100644
--- a/keystoneclient/tests/unit/v3/utils.py
+++ b/keystoneclient/tests/unit/v3/utils.py
@@ -280,7 +280,7 @@ class CrudTests(object):
         return expected_path
 
     def test_list_by_id(self, ref=None, **filter_kwargs):
-        """Test ``entities.list(id=x)`` being rewritten as ``GET /v3/entities/x``.
+        """Test ``entities.list(id=x)`` being rewritten as ``GET /v3/entities/x``.  # noqa
 
         This tests an edge case of each manager's list() implementation, to
         ensure that it "does the right thing" when users call ``.list()``
diff --git a/keystoneclient/v3/application_credentials.py b/keystoneclient/v3/application_credentials.py
index 0f2e0b597..3e9286279 100644
--- a/keystoneclient/v3/application_credentials.py
+++ b/keystoneclient/v3/application_credentials.py
@@ -137,7 +137,7 @@ class ApplicationCredentialManager(base.CrudManager):
         return super(ApplicationCredentialManager, self).list(**kwargs)
 
     def find(self, user=None, **kwargs):
-        """Find an application credential with attributes matching ``**kwargs``.
+        """Find an application credential with attributes matching ``**kwargs``.  # noqa
 
         :param string user: User ID
 
diff --git a/requirements.txt b/requirements.txt
index 362cf2941..343c98f7e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,6 @@
 # Requirements lower bounds listed here are our best effort to keep them up to
 # date but we do not test them so no guarantee of having them all correct. If
 # you find any incorrect lower bounds, let us know or propose a fix.
-
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 
 debtcollector>=1.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 97d0cd5a5..eb310e8d1 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,4 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=6.1.0,<6.2.0 # Apache-2.0
 flake8-docstrings==1.7.0 # MIT
 
 coverage!=4.4,>=4.0 # Apache-2.0