diff --git a/CODEOWNERS b/CODEOWNERS
index 8aabd9261..4e359e31d 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -24,7 +24,9 @@
 /website/pages/docs/builders/linode* @displague @ctreatma @stvnjacobs @charliekenney23 @phillc
 
 /builder/lxc/                      @ChrisLundquist
-/website/pages/docs/builders/lxc* @ChrisLundquist
+/website/pages/docs/builders/lxc*  @ChrisLundquist
+/test/fixtures/builder-lxc/        @ChrisLundquist
+/test/builder_lxc*                 @ChrisLundquist
 
 /builder/lxd/                      @ChrisLundquist
 /website/pages/docs/builders/lxd* @ChrisLundquist
@@ -54,8 +56,10 @@
 /website/pages/docs/builders/hcloud* @LKaemmerling
 
 /examples/hyperone/                    @m110 @gregorybrzeski @ad-m
-/builder/hyperone/                      @m110 @gregorybrzeski @ad-m
+/builder/hyperone/                     @m110 @gregorybrzeski @ad-m
 /website/pages/docs/builders/hyperone* @m110 @gregorybrzeski @ad-m
+/test/builder_hyperone*                @m110 @gregorybrzeski @ad-m
+/test/fixtures/builder-hyperone/       @m110 @gregorybrzeski @ad-m
 
 /examples/ucloud/                     @shawnmssu
 /builder/ucloud/                      @shawnmssu