diff --git a/.circleci/config.yml b/.circleci/config.yml
index 964c86b05..ce1561e66 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -186,9 +186,8 @@ jobs:
               --format standard-verbose \
               --junitfile /tmp/test-reports/<< parameters.suite >>/junit.xml \
               --jsonfile /tmp/test-artifacts/<< parameters.suite >>.json \
-              -- \
-              << parameters.go-test-flags >> \
-              << parameters.target >>
+              --packages="<< parameters.target >>" \
+              -- << parameters.go-test-flags >>
           no_output_timeout: 30m
       - store_test_results:
           path: /tmp/test-reports
diff --git a/.circleci/template.yml b/.circleci/template.yml
index 6bb688d27..1b79e595c 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -186,9 +186,8 @@ jobs:
               --format standard-verbose \
               --junitfile /tmp/test-reports/<< parameters.suite >>/junit.xml \
               --jsonfile /tmp/test-artifacts/<< parameters.suite >>.json \
-              -- \
-              << parameters.go-test-flags >> \
-              << parameters.target >>
+              --packages="<< parameters.target >>" \
+              -- << parameters.go-test-flags >>
           no_output_timeout: 30m
       - store_test_results:
           path: /tmp/test-reports