diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 4e310f9254cde..6a2c29e06c81e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -116,6 +116,9 @@
 /lib                                            @timothybjacobs @spacedmonkey
 /lib/global-styles.php                          @timothybjabocs @spacedmonkey @nosolosw
 /lib/experimental-default-theme.json            @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json.php                    @timothybjabocs @spacedmonkey @nosolosw
+/lib/class-wp-theme-json-resolver.php           @timothybjabocs @spacedmonkey @nosolosw
+/phpunit/class-wp-theme-json-test.php           @nosolosw
 
 # Native (Unowned)
 *.native.js                                     @ghost