diff --git a/tangostationcontrol/test-requirements.txt b/tangostationcontrol/test-requirements.txt
index 16a9033db5279a246609fdc0f9c941d26c74792a..1c18f0949ae6a3059fa0dcce9059e016a9a76e22 100644
--- a/tangostationcontrol/test-requirements.txt
+++ b/tangostationcontrol/test-requirements.txt
@@ -7,6 +7,7 @@ bandit>=1.6.0 # Apache-2.0
 coverage>=5.2.0 # Apache-2.0
 doc8>=0.8.0 # Apache-2.0
 flake8>=3.8.0 # MIT
+flake8-bugbear>=22.1.11 # MIT
 flake8-breakpoint>=1.1.0 # MIT
 flake8-debugger>=4.0.0 #MIT
 flake8-mock>=0.3 #GPL
diff --git a/tangostationcontrol/tox.ini b/tangostationcontrol/tox.ini
index fc688b430a9cdaa3805f5340e22826003e553080..c33316109926f6be052c0bd99b4ef5cd51a1217c 100644
--- a/tangostationcontrol/tox.ini
+++ b/tangostationcontrol/tox.ini
@@ -76,5 +76,5 @@ commands =
 
 [flake8]
 filename = *.py,.stestr.conf,.txt
-select = W292,B601,B602,T100,M001,F401
+select = W292,B601,B602,T100,M001,F401,B001,B002,B003,B004,B005,B006,B007,B008,B009,B010,B011,B012,B013,B014.B015,B016,B017,B018
 exclude=.tox,.egg-info