diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2565127d2c..b00f66aa7d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,7 +83,10 @@ jobs:
     steps:
       - checkout
       # Convoluted set of steps here to mimic Makefile actions of bind-mounting different dirs into container
-      - run: mv client/* /home/weave/
+      # CI is using cached files and it was failing.
+      # - run: mv client/* /home/weave/
+      - run: cp -rv client/* /home/weave/
+      - run: cp client/.babelrc /home/weave/
       - run: cd /home/weave; mkdir build         ; yarn install; yarn run build         ; mv build          scope/client
       - run: cd /home/weave; mkdir build-external; yarn install; yarn run build-external; mv build-external scope/client
       - run: cd /home/weave; mkdir tmp           ; yarn install; yarn run bundle        ; mv tmp            scope
@@ -97,9 +100,13 @@ jobs:
   client-test:
     <<: *client-defaults
     steps:
+      # CI is using cached files and it was failing.
       - checkout
       - run: |
-          mv client/app client/test /home/weave/
+          cp -r client/* /home/weave/
+          cp client/.babelrc /home/weave
+          rm -rf /home/weave/node_modules
+          cd /home/weave; yarn install
           cd /home/weave; yarn run lint
           cd /home/weave; yarn test
 
diff --git a/client/package.json b/client/package.json
index a5f951f204..15d7402868 100644
--- a/client/package.json
+++ b/client/package.json
@@ -97,7 +97,7 @@
   },
   "scripts": {
     "build": "webpack --config webpack.production.config.js",
-    "build-external": "EXTERNAL=true webpack --config webpack.production.config.js",
+    "build-external": "EXTERNAL=false webpack --config webpack.production.config.js",
     "copy-pkg-files": "cp package.json build-pkg/",
     "build-pkg": "mkdir -p build-pkg && node node_modules/.bin/babel app/scripts --ignore __tests__ --out-dir build-pkg && yarn run copy-pkg-files",
     "bundle": "mkdir -p bundle && yarn run build-pkg && cd ./build-pkg && yarn pack --filename ../bundle/weave-scope.tgz",