diff --git a/.circleci/config.yml b/.circleci/config.yml
index a183d2f..9c10d2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,10 +52,21 @@ jobs:
             - /caches/app.tar
       - run: 
           command: curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | sh
+  test:
+    working_directory: /app
+    docker:
+      - image: docker:17.09.0-ce-git
+    steps:
+      - checkout
       - run:
           name: helm lint for minikube
           command: |
             cd helm; helm lint plone-stack -f plone-stack/values-minikube.yaml
+  release:
+    working_directory: /app
+    docker:
+      - image: docker:17.09.0-ce-git
+    steps:
       - deploy:
           name: Push application Docker image
           command: |
@@ -79,13 +90,15 @@ jobs:
             docker images
 workflows:
   version: 2
-  test:
-    jobs:
-      - build:
-          context: docker-hub
-  release:
+  build-test-release:
     jobs:
-      - build:
+      - build
+      - test:
+          requires: 
+            - build
+      - release:
+          requires: 
+            - test
           context: docker-hub
           filters:
             branches: