diff --git a/mypy.ini b/mypy.ini
index 3da7cfa..7762413 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -9,6 +9,7 @@ disallow_any_generics = True
 disallow_untyped_calls = True
 warn_redundant_casts = True
 warn_unused_configs = True
+warn_unreachable = True
 strict_equality = True
 
 [mypy-libp2p.kademlia.*]
diff --git a/setup.py b/setup.py
index 626e9d8..ccc6543 100644
--- a/setup.py
+++ b/setup.py
@@ -16,6 +16,7 @@ extras_require = {
         "black==19.3b0",
         "isort==4.3.21",
         "flake8>=3.7.7,<4.0.0",
+        "flake8-bugbear",
     ],
     "dev": ["tox>=3.13.2,<4.0.0", "docformatter"],
 }
diff --git a/tests_interop/daemon.py b/tests_interop/daemon.py
index 83aa82d..f17ef11 100644
--- a/tests_interop/daemon.py
+++ b/tests_interop/daemon.py
@@ -5,6 +5,7 @@ from typing import Any, List
 import multiaddr
 from multiaddr import Multiaddr
 from p2pclient import Client
+import pytest
 
 from libp2p.peer.id import ID
 from libp2p.peer.peerinfo import PeerInfo, info_from_p2p_addr
@@ -32,7 +33,7 @@ async def try_until_success(coro_func, timeout=TIMEOUT_DURATION):
             break
         if (time.monotonic() - t_start) >= timeout:
             # timeout
-            assert False, f"{coro_func} is still failing after `{timeout}` seconds"
+            pytest.fail(f"{coro_func} is still failing after `{timeout}` seconds")
         await asyncio.sleep(0.01)