diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 00cd77b65592370337841b56975ce22ae0cda224..40759f1a38a1864f4b53c95f17880fd88f29d2c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,8 +36,6 @@ composer:
     - if: '$CI_COMMIT_MESSAGE =~ /test/'
     - if: '$CI_COMMIT_BRANCH  =~ /test/ || $CI_COMMIT_BRANCH == "production" || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
   script:
-    - echo ${CI_PROJECT_DIR}
-    - ls ${CI_PROJECT_DIR}
     - docker run -v ${CI_PROJECT_DIR}:/sites/memorekall/www/web_dev -v /log:/sites/memorekall/www/log $TEST_IMAGE ./tools/ci-job.sh
   artifacts:
     when: always
diff --git a/tools/ci-job.sh b/tools/ci-job.sh
index 90f887cf9d81a5be141497c2c8158b46262c6c34..4717f4a11e20300be496552cd09d9442ddb4fffa 100755
--- a/tools/ci-job.sh
+++ b/tools/ci-job.sh
@@ -1,7 +1,16 @@
 #!/bin/bash
-cd "$(dirname $0)/.."
+exit_on_fail(){
+    if [ $1 -ne 0 ];
+    then
+        echo "Failed $2"
+        exit $1
+    fi
+}
 composer install
+exit_on_fail $? "PHP dependencies"
 npm install
+exit_on_fail $? "Javascript dependencies"
 npm run dev
+exit_on_fail $? "Building assets"
 composer ci
-
+exit_on_fail $? "Tests"