diff --git a/.circleci/config.yml b/.circleci/config.yml
index d280fda2c..944247997 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,13 +104,18 @@ jobs:
           name: Setup the test results directory
           command: mkdir -p /tmp/circleci-test-results
       - run:
-          name: Run the unit tests
-          command: yarn test
+          name: Run the client unit tests
+          command: yarn test:client --ci --testResultsProcessor="./node_modules/jest-junit-reporter
           environment:
-            MOCHA_FILE: /tmp/circleci-test-results/junit/test-results.xml
+            TEST_REPORT_PATH: /tmp/circleci-test-results/jest/test-results.xml
+      - run:
+          name: Run the server unit tests
+          command: yarn test:server
+          environment:
+            MOCHA_FILE: /tmp/circleci-test-results/mocha/test-results.xml
             MOCHA_REPORTER: mocha-junit-reporter
-            NODE_ENV: test
       - store_test_results:
+          when: always
           path: /tmp/circleci-test-results
   
   # test_integration_chrome_local will run the integration tests locally with
diff --git a/package.json b/package.json
index 9c5f58ff5..b443d540a 100644
--- a/package.json
+++ b/package.json
@@ -216,6 +216,7 @@
     "identity-obj-proxy": "^3.0.0",
     "ip": "^1.1.5",
     "jest": "^21.2.1",
+    "jest-junit-reporter": "^1.1.0",
     "lint-staged": "^7.0.0",
     "mocha": "^3.1.2",
     "mocha-junit-reporter": "^1.12.1",
diff --git a/yarn.lock b/yarn.lock
index 62eb054fb..947eb7f80 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5399,6 +5399,12 @@ jest-jasmine2@^22.4.2:
     jest-util "^22.4.1"
     source-map-support "^0.5.0"
 
+jest-junit-reporter@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/jest-junit-reporter/-/jest-junit-reporter-1.1.0.tgz#88d6006ec13f82df40c47882c8640989cdcb1434"
+  dependencies:
+    xml "^1.0.1"
+
 jest-matcher-utils@^21.2.1:
   version "21.2.1"
   resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-21.2.1.tgz#72c826eaba41a093ac2b4565f865eb8475de0f64"
@@ -10987,7 +10993,7 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
-xml@^1.0.0:
+xml@^1.0.0, xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"