diff --git a/.circleci/config.yml b/.circleci/config.yml
index a7f4e22328..d09c589c88 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -243,8 +243,9 @@ jobs:
               --junitfile $TEST_RESULTS_DIR/gotestsum-report.xml -- \
               -tags="$GOTAGS" -p 2 \
               -race -gcflags=all=-d=checkptr=0 \
-              ./agent/{ae,cache,checks,config,pool,proxycfg,router} \
-              ./agent/consul/{authmethod/...,autopilot,fsm,state,stream} \
+              ./agent/{ae,cache,cache-types,checks,config,pool,proxycfg,router}/... \
+              ./agent/consul/{authmethod,autopilot,fsm,state,stream}/... \
+              ./agent/{grpc,rpc,rpcclient,submatview}/... \
               ./snapshot
 
       - store_test_results: