diff --git a/circle.yml b/circle.yml
index c9245d3da..aaf25617d 100644
--- a/circle.yml
+++ b/circle.yml
@@ -5,36 +5,34 @@ dependencies:
     - sudo apt-get -y install qemu-system-arm gcc-arm-linux-gnueabi libc6-dev-armel-cross gcc-aarch64-linux-gnu libc6-dev-arm64-cross
     - sudo apt-get -y install libc6-dev-i386 clang gcc-5 gcc-6 valgrind
 
-test:
-  override:
-  # Tests compilers and C standards
+  # use default "parallel: true" for commands in the machine, checkout, dependencies and database build phase
+  post:
+    # Tests for thread 1
     - |
-      [[ "$CIRCLE_NODE_INDEX" == "0" ]] && clang -v && make clangtest && make clean:
-        parallel: true
-    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then g++ -v; make gpptest && make clean; fi:
-        parallel: true
-    #- gcc -v; make gnu90test   && make clean
-    #- gcc -v; make c99test     && make clean
-    #- gcc -v; make gnu99test   && make clean
-    #- gcc-5 -v; make gcc5test  && make clean
-    #- gcc-6 -v; make gcc6test  && make clean
-  # Shorter tests
+      [[ "$CIRCLE_NODE_INDEX" == "0" ]] && clang -v && make clangtest && make clean
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  g++ -v; make gpptest    && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  gcc -v; make gnu90test  && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  gcc -v; make c99test    && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  gcc -v; make gnu99test  && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  gcc-5 -v; make gcc5test && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  gcc-6 -v; make gcc6test && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  make cmaketest          && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  make travis-install     && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  make lib                && make clean; fi
+    - if [[ "$CIRCLE_NODE_INDEX" == "0" ]]; then  make -C programs zstd-small zstd-decompress zstd-compress  && make clean; fi
+
+    # Tests for thread 1 (when CIRCLE_NODE_TOTAL=1) or thread 2
     - |
-      [[ "$CIRCLE_NODE_TOTAL" < "2" ] || [ "$CIRCLE_NODE_INDEX" == "1" ]] && make cmaketest && make clean:
-        parallel: true
-    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ] || [ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C lib all && make clean; fi:
-        parallel: true
-    #- make -C tests dll            && make clean
-    #- make -C tests test-zstd      && make clean
-    #- make -C tests test-fullbench && make clean
-    #- make -C tests test-fuzzer    && make clean
-    #- make -C tests test-zstream   && make clean
-    #- make -C tests test-invalidDictionaries && make clean
-    #- make -C tests test-legacy    && make clean
-    #- make -C tests test-symbols   && make clean
-    #- make -C tests test-longmatch && make clean
-    #- make -C programs zstd-small zstd-decompress zstd-compress && make -C programs clean
-    #- make travis-install          && make clean
+      [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]] && make -C tests test-zstd && make clean
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-fullbench && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-fuzzer    && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-zstream   && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-legacy    && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-symbols   && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-longmatch && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests test-invalidDictionaries && make clean; fi
+    - if [[ "$CIRCLE_NODE_TOTAL" < "2" ]] || [[ "$CIRCLE_NODE_INDEX" == "1" ]]; then make -C tests dll            && make clean; fi
+
   # Longer tests
     #- make -C tests test-zstd-nolegacy && make clean
     #- pyenv global 3.4.4; make -C tests versionsTest && make clean