diff --git a/circle.yml b/circle.yml
index 74f660b42..57b320f75 100644
--- a/circle.yml
+++ b/circle.yml
@@ -37,6 +37,5 @@ test:
           background: true
     - sleep 2
     # Set ATLANTIS_URL environment variable to be used by atlantis e2e test to create the webhook
-    - echo '' >> ~/.circlerc
-    - echo 'export ATLANTIS_URL=$(curl -s 'http://localhost:4040/api/tunnels' | jq -r '.tunnels[1].public_url') ' >> ~/.circlerc
+    - echo '' >> ~/.circlerc && echo 'export ATLANTIS_URL=$(curl -s 'http://localhost:4040/api/tunnels' | jq -r '.tunnels[1].public_url') ' >> ~/.circlerc
     - cd "${WORKDIR}/e2e" && ../scripts/e2e.sh
diff --git a/scripts/build.sh b/scripts/build.sh
index 20d8d452e..0b6fe90a6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -11,3 +11,5 @@ run_unit_test
 # Build packages to make sure they can be compiled
 echo "Running 'make build'"
 make build-service
+
+# TODO: add parallel builds for every make target that has anything to do with testing.