diff --git a/.drone.yml b/.drone.yml
index 88b995b..59300e0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,29 +35,52 @@ platform:
 
 steps:
 
+  - name:  prepare_workspace
+    image: alpine
+    commands:
+      - mkdir -p /drone/src/tests/update-system
+      - mv defaults /drone/src/tests/update-system/
+      - mv files /drone/src/tests/update-system/
+      - mv handlers /drone/src/tests/update-system/
+      - mv meta /drone/src/tests/update-system/
+      - mv tasks /drone/src/tests/update-system/
+      - mv vars /drone/src/tests/update-system/
+    when:
+      event:
+      - push
+      - pull_request
+
   - name: test-debian7
     image: lerentis/ansible:debian-7
     commands:
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml
+    depends_on:
+      - "prepare_workspace"
 
   - name: test-ubuntu16
     image: lerentis/ansible:ubuntu-16.04
     commands:
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml 
+    depends_on:
+      - "prepare_workspace"
 
   - name: test-ubuntu18
     image: lerentis/ansible:ubuntu-18.04
     commands:
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml 
+    depends_on:
+      - "prepare_workspace"
 
   - name: test-ubuntu20
     image: lerentis/ansible:ubuntu-20.04
     commands:
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml 
+    depends_on:
+      - "prepare_workspace"
 
 depends_on:
 - prepare_workspace
@@ -73,12 +96,29 @@ platform:
 
 steps:
 
+  - name:  prepare_workspace
+    image: alpine
+    commands:
+      - mkdir -p /drone/src/tests/update-system
+      - mv defaults /drone/src/tests/update-system/
+      - mv files /drone/src/tests/update-system/
+      - mv handlers /drone/src/tests/update-system/
+      - mv meta /drone/src/tests/update-system/
+      - mv tasks /drone/src/tests/update-system/
+      - mv vars /drone/src/tests/update-system/
+    when:
+      event:
+      - push
+      - pull_request
+
   - name: test-arch
     image: lerentis/ansible:arch
     commands:
-      - pacman -S python2 --noconfirm
+      - pacman -Sy python2 --noconfirm
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml 
+    depends_on:
+      - "prepare_workspace"
 
 depends_on:
 - prepare_workspace
@@ -94,11 +134,28 @@ platform:
 
 steps:
 
+  - name:  prepare_workspace
+    image: alpine
+    commands:
+      - mkdir -p /drone/src/tests/update-system
+      - mv defaults /drone/src/tests/update-system/
+      - mv files /drone/src/tests/update-system/
+      - mv handlers /drone/src/tests/update-system/
+      - mv meta /drone/src/tests/update-system/
+      - mv tasks /drone/src/tests/update-system/
+      - mv vars /drone/src/tests/update-system/
+    when:
+      event:
+      - push
+      - pull_request
+
   - name: test-centos7
     image: lerentis/ansible:centos-7
     commands:
       - ansible-playbook -i tests/inventory tests/test-playbook.yml --syntax-check
       - ansible-playbook -i tests/inventory tests/test-playbook.yml 
+    depends_on:
+      - "prepare_workspace"
 
 depends_on:
 - prepare_workspace