diff --git a/ironic/conf/snmp.py b/ironic/conf/snmp.py
index acaae9ad02..1dd84181b6 100644
--- a/ironic/conf/snmp.py
+++ b/ironic/conf/snmp.py
@@ -1,10 +1,6 @@
 # Copyright 2016 Intel Corporation
 # Copyright 2013,2014 Cray Inc
 #
-# Authors: David Hewson <dhewson@cray.com>
-#          Stig Telfer <stelfer@cray.com>
-#          Mark Goddard <mgoddard@cray.com>
-#
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py
index af5d7b72b0..4e8b0a18f7 100644
--- a/ironic/drivers/modules/snmp.py
+++ b/ironic/drivers/modules/snmp.py
@@ -1,9 +1,5 @@
 # Copyright 2013,2014 Cray Inc
 #
-# Authors: David Hewson <dhewson@cray.com>
-#          Stig Telfer <stelfer@cray.com>
-#          Mark Goddard <mgoddard@cray.com>
-#
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/ironic/tests/unit/drivers/modules/test_snmp.py b/ironic/tests/unit/drivers/modules/test_snmp.py
index f7a95aa064..485e523c40 100644
--- a/ironic/tests/unit/drivers/modules/test_snmp.py
+++ b/ironic/tests/unit/drivers/modules/test_snmp.py
@@ -1,9 +1,5 @@
 # Copyright 2013,2014 Cray Inc
 #
-# Authors: David Hewson <dhewson@cray.com>
-#          Stig Telfer <stelfer@cray.com>
-#          Mark Goddard <mgoddard@cray.com>
-#
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
diff --git a/test-requirements.txt b/test-requirements.txt
index 86db1716d3..ff095dab8a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # 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<0.11,>=0.10.0
+hacking>=0.11.0,<0.12  # Apache-2.0
 coverage>=3.6 # Apache-2.0
 doc8 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD