diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7debd3f..c04cb3c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,6 +25,20 @@ commands:
                 command: |
                     apt-get update --yes && apt-get install --yes python3 python3-venv git make
 
+    setup_pkgs:
+        description: Setup pkgs for integration and upgrade tests
+        steps:
+            - run:
+                name: setup python3
+                command: |
+                    apk add --no-cache python3 pytest
+            - run:
+                name: install curl and jq
+                command: |
+                    apk add curl curl-dev
+                    apk add jq
+
+
     build_systemd_image:
         steps:
             - run:
@@ -141,15 +155,7 @@ jobs:
             - image: docker:18.05.0-ce-git
 
         steps:
-            - run:
-                name: setup python3
-                command: |
-                    apk add --no-cache python3 pytest
-            - run:
-                name: install curl and jq
-                command: |
-                    apk add curl curl-dev
-                    apk add jq
+            - setup_pkgs
 
             - checkout
 
@@ -171,10 +177,7 @@ jobs:
             - image: docker:18.05.0-ce-git
 
         steps:
-            - run:
-                name: setup python3
-                command: |
-                    apk add --no-cache python3 pytest
+            - setup_pkgs
 
             - checkout