diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f034a27c4444b3da4aa24a629b96b4b3e8e9d6ee..b6bcfc7a5c58e1056d5b1c2f526fe47c109686ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 stages:
     - build
+    - test
     - deploy    
 
 
@@ -78,21 +79,17 @@ ubuntu1604_x86_64:
     - cmake -DCHAOS_WAN=ON -DCHAOS_CCS=ON -DCERN_ROOT=$INSTALL_DIR -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR . |& tee $DISTRIB_PREFIX/bundle.configuration.log
     - make  -j 4 install
     - source $INSTALL_DIR/chaos_env.sh
-    - if ! $INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;then echo "* retrying test in debug mode";export CHAOS_DEBUG_CMD_TOOL="gdb";$INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;fi
     - cd chaosframework/ccs;qmake;echo "* compiling CCS";make -j 4 >& $DISTRIB_PREFIX/ccs.compilation.log ;cp ccs $INSTALL_DIR/bin;cd ../../
-    - scripts/strip_symbols.sh $INSTALL_DIR
     - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
   artifacts:
         when: always
         name: "$DISTRIB_NAME.tar.gz"
         paths:
           - ./*.tar.gz
-          - /usr/local/chaos/chaos-distrib/log
-        expire_in: 1 day
-  after_script:
-     - echo "* compatting files in $INSTALL_DIR"
-     - tar cfz test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz -C /usr/local/chaos/chaos-distrib log
-     - if scp test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/logs;then echo "* [$CI_RUNNER_DESCRIPTION] log transferred ok";else echo "%% [$CI_RUNNER_DESCRIPTION] cannot copy";fi
+        expire_in: 5 day
+
+
+
 
 ubuntu1604_static_x86_64:
   services:
@@ -241,6 +238,71 @@ deploy_stage:
   allow_failure: true
 
 
+ubuntu1604_test_x86_64:
+  stage: test
+  services:
+  - name: couchbase/server:community-3.1.3
+    alias: couchbase
+  - name: mongo:3.4
+    alias: mongo
+
+  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604
+  script:
+    - tar xfz $DISTRIB_NAME.tar.gz -C /
+    - scripts/dbinit.sh couchbase mongo
+    - repo init -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
+    - repo sync
+    - cp -r tools $INSTALL_DIR
+    - cp -r common/test $INSTALL_DIR/tools
+    - source $INSTALL_DIR/chaos_env.sh
+    - if ! $INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;then echo "* retrying test in debug mode";export CHAOS_DEBUG_CMD_TOOL="gdb";$INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;fi
+    - scripts/strip_symbols.sh $INSTALL_DIR
+    - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
+  artifacts:
+        when: always
+        name: "$DISTRIB_NAME.tar.gz"
+        paths:
+          - ./*.tar.gz
+          - /usr/local/chaos/chaos-distrib/log/*
+        expire_in: 1 day
+  after_script:
+     - echo "* compatting files in $INSTALL_DIR"
+     - tar cfz test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz -C /usr/local/chaos/chaos-distrib log
+     - if scp test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/logs;then echo "* [$CI_RUNNER_DESCRIPTION] log transferred ok";else echo "%% [$CI_RUNNER_DESCRIPTION] cannot copy";fi
+
+
+ubuntu1404_test_x86_64:
+  stage: test
+  services:
+  - name: couchbase/server:community-3.1.3
+    alias: couchbase
+  - name: mongo:3.4
+    alias: mongo
+
+  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1404
+  script:
+    - tar xfz $DISTRIB_NAME.tar.gz -C /
+    - scripts/dbinit.sh couchbase mongo
+    - repo init -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
+    - repo sync
+    - cp -r tools $INSTALL_DIR
+    - cp -r common/test $INSTALL_DIR/tools
+    - source $INSTALL_DIR/chaos_env.sh
+    - if ! $INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;then echo "* retrying test in debug mode";export CHAOS_DEBUG_CMD_TOOL="gdb";$INSTALL_DIR/tools/chaos_test.sh -d $INSTALL_DIR/tools/test;fi
+    - scripts/strip_symbols.sh $INSTALL_DIR
+    - tar cfz $DISTRIB_NAME.tar.gz -C /usr/local/chaos chaos-distrib
+  artifacts:
+        when: always
+        name: "$DISTRIB_NAME.tar.gz"
+        paths:
+          - ./*.tar.gz
+          - /usr/local/chaos/chaos-distrib/log/*
+        expire_in: 1 day
+  after_script:
+     - echo "* compatting files in $INSTALL_DIR"
+     - tar cfz test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz -C /usr/local/chaos/chaos-distrib log
+     - if scp test-log.$CI_JOB_NAME.$CI_RUNNER_DESCRIPTION.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/logs;then echo "* [$CI_RUNNER_DESCRIPTION] log transferred ok";else echo "%% [$CI_RUNNER_DESCRIPTION] cannot copy";fi
+