diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4d80698eff39..eb6fc2c18423 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -74,8 +74,9 @@ Include/pytime.h              @pganssle @abalkin
 
 # Parser/Pgen
 /Parser/pgen/                 @pablogsal
-/Parser/pegen/                @pablogsal
-/Tools/peg_generator/         @pablogsal
+/Parser/pegen/                @pablogsal @lysnikolaou
+/Tools/peg_generator/         @pablogsal @lysnikolaou
+/Lib/test/test_peg_generator/ @pablogsal @lysnikolaou
 
 # SQLite 3
 **/*sqlite*                   @berkerpeksag