diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 77557e0bd4..e2e25180a1 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -10,6 +10,7 @@ les/                            @zsfelfoldi
 light/                          @zsfelfoldi
 mobile/                         @karalabe
 p2p/                            @fjl @zsfelfoldi
-p2p/simulations                 @zelig @nonsense @janos
-p2p/protocols                   @zelig @nonsense @janos
+p2p/simulations                 @zelig @nonsense @janos @justelad
+p2p/protocols                   @zelig @nonsense @janos @justelad
+p2p/testing                     @zelig @nonsense @janos @justelad
 whisper/                        @gballet @gluk256