diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9396e49011..4413c72b2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -506,7 +506,7 @@ jobs:
           at: ui-v2
       - run:
           working_directory: ui-v2
-          command: node_modules/ember-cli/bin/ember exam --split=$CIRCLE_NODE_TOTAL --partition=`expr $CIRCLE_NODE_INDEX + 1` --path dist --silent -r xunit
+          command: make test-ci
       - store_test_results:
           path: ui-v2/test-results
 
diff --git a/ui-v2/GNUmakefile b/ui-v2/GNUmakefile
index fdc401c958..ed8b59f1da 100644
--- a/ui-v2/GNUmakefile
+++ b/ui-v2/GNUmakefile
@@ -38,6 +38,9 @@ start-api: deps
 test: deps test-node
 	yarn run test
 
+test-ci: deps test-node
+	yarn run test:ci
+
 test-view: deps test-node
 	yarn run test:view
 
diff --git a/ui-v2/package.json b/ui-v2/package.json
index 35f8b58749..14cff9b313 100644
--- a/ui-v2/package.json
+++ b/ui-v2/package.json
@@ -22,6 +22,7 @@
     "start:consul": "ember serve --proxy=${CONSUL_HTTP_ADDR:-http://localhost:8500} --port=${EMBER_SERVE_PORT:-4200} --live-reload-port=${EMBER_LIVE_RELOAD_PORT:-7020}",
     "start:api": "api-double --dir ./node_modules/@hashicorp/consul-api-double",
     "test": "ember test --test-port=${EMBER_TEST_PORT:-7357}",
+    "test:ci": "ember test --test-port=${EMBER_TEST_PORT:-7357} --path dist --silent --reporter xunit",
     "test:parallel": "EMBER_EXAM_PARALLEL=true ember exam --split=4 --parallel",
     "test:view": "ember test --server --test-port=${EMBER_TEST_PORT:-7357}",
     "test:node": "tape ./node-tests/**/*.js",