diff --git a/.travis.yml b/.travis.yml
index 9548d2061..c91aa0301 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ install:
   - docker-compose -f docker-compose.sample.yml -f docker-compose.testing.yml run --rm cli azuracast_install
 
 script:
-  - docker-compose -f docker-compose.sample.yml -f docker-compose.testing.yml run --rm cli azuracast_testing
+  - docker-compose -f docker-compose.sample.yml -f docker-compose.testing.yml run --rm cli vendor/bin/codecept run --no-interaction --coverage --coverage-xml --fail-fast
 
 after_failure:
-  - cat tests/_output/*.html
\ No newline at end of file
+  - cat tests/_output/*.html
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 056181c80..209341989 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -96,7 +96,8 @@ services:
     restart: always
 
   cli:
-    image: azuracast/azuracast_web:latest
+    build:
+      context: ./util/docker/testing
     volumes_from:
       - web
     depends_on:
diff --git a/docker-compose.testing.yml b/docker-compose.testing.yml
index 3f1562293..a56507567 100644
--- a/docker-compose.testing.yml
+++ b/docker-compose.testing.yml
@@ -6,9 +6,12 @@ services:
       - .:/var/azuracast/www
 
   cli:
+    image: azuracast_cli:latest
+    build:
+      context: ./util/docker/testing
     environment:
       APPLICATION_ENV: "testing"
 
   nginx:
     volumes:
-      - .:/var/azuracast/www
\ No newline at end of file
+      - .:/var/azuracast/www
diff --git a/util/docker/testing/Dockerfile b/util/docker/testing/Dockerfile
new file mode 100644
index 000000000..16ccdcdbb
--- /dev/null
+++ b/util/docker/testing/Dockerfile
@@ -0,0 +1,4 @@
+FROM azuracast/azuracast_web:latest
+
+RUN apt-get update \
+    && apt-get install -q -y php7.2-xdebug