diff --git a/.builds/archlinux.yaml b/.builds/archlinux.yaml
index 9e50858..f7ad850 100644
--- a/.builds/archlinux.yaml
+++ b/.builds/archlinux.yaml
@@ -29,13 +29,11 @@ environment:
   # TODO: ETESYNC_TESTS
 tasks:
   - setup: |
+      sudo systemctl start docker
       cd vdirsyncer
       python setup.py build
       sudo pip install --no-index .
-      sudo systemctl start docker
   - test: |
       cd vdirsyncer
-      # Non-system python is used for packages:
-      export PATH=$PATH:~/.local/bin/
       make -e ci-test
       make -e ci-test-storage
diff --git a/.builds/tests-minimal.yaml b/.builds/tests-minimal.yaml
index 004ed9e..dec4ba0 100644
--- a/.builds/tests-minimal.yaml
+++ b/.builds/tests-minimal.yaml
@@ -19,8 +19,8 @@ environment:
   # TODO: ETESYNC_TESTS
 tasks:
   - setup: |
-      cd vdirsyncer
       sudo systemctl start docker
+      cd vdirsyncer
       make -e install-test
   - test: |
       cd vdirsyncer
diff --git a/.builds/tests-release.yaml b/.builds/tests-release.yaml
index 380b45a..05d838a 100644
--- a/.builds/tests-release.yaml
+++ b/.builds/tests-release.yaml
@@ -16,10 +16,9 @@ environment:
   # TODO: ETESYNC_TESTS
 tasks:
   - setup: |
-      cd vdirsyncer
       sudo systemctl start docker
-      make -e install-test
-      make -e install-style
+      cd vdirsyncer
+      make -e install-test -e install-style
   - test: |
       cd vdirsyncer
       # Non-system python is used for packages: