diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9095fa57..89d9ceac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,18 +36,17 @@ jobs:
   smoke-tests:
     machine:
       image: circleci/classic:201709-01
+    working_directory: /home/circleci/src/github.com/weaveworks/weave
     environment:
-      GOPATH: /home/circleci
       SRCDIR: /home/circleci/src/github.com/weaveworks/weave
       CIRCLE_ARTIFACTS: /tmp/artifacts
     parallelism: 2
     steps:
       - checkout
       - run: mkdir $CIRCLE_ARTIFACTS
-      # copy source dir and submodule update --init
-      - run: bin/circle-dependencies-post-sources
+      - run: git submodule update --init
       - attach_workspace:
-          at: /home/circleci/src/github.com/weaveworks/weave
+          at: .
       # kick off creation of test VMs
       - run:
           command: bin/provision_test_vms.sh
diff --git a/bin/circle-dependencies-post-sources b/bin/circle-dependencies-post-sources
deleted file mode 100755
index 8723f116..00000000
--- a/bin/circle-dependencies-post-sources
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p "$(dirname "$SRCDIR")" && cp -r "$(pwd)/" "$SRCDIR"
-cd "$SRCDIR"
-git submodule update --init