diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aea62f2c2888786793965d7f78dfe5a25d45516a..e8cc3726e48f0bfa735f7c7ad7c4733b3195dd0f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,8 +59,9 @@ test-job:
   script:
     - ls -lha /exlibris/
     - ROSETTASDK=$ROSETTASDK make check_prerequisites
-    - /usr/sbin/clamd --debug || cat /var/log/clamav/clamav.log
-    - ROSETTASDK=$ROSETTASDK make test
+    - mkdir -p /var/run/clamav && chown -R clamav.root /var/run/clamav
+    - /usr/sbin/clamd || cat /var/log/clamav/clamav.log
+    - ROSETTASDK=$ROSETTASDK make -e test
 
 packaging-job:
   stage: packaging
diff --git a/gitlab-ci/Dockerfile b/gitlab-ci/Dockerfile
index e27134be06311fde06af66dcc926c15ed7284ba5..26cfff5266b2a994ee7dddbe3cad65c1d8b1ea75 100644
--- a/gitlab-ci/Dockerfile
+++ b/gitlab-ci/Dockerfile
@@ -27,4 +27,3 @@ RUN git clone https://github.com/ExLibrisGroup/Rosetta.dps-sdk-projects.git
 RUN ln -s ${EXLIBRIS_REPODIR} ${EXLIBRIS_PATH}
 RUN echo TCPSocket 3310 >> /etc/clamav/clamd.conf ; echo TCPAddr 127.0.0.1 >> /etc/clamav/clamd.conf
 RUN /usr/bin/freshclam
-RUN mkdir -p /var/run/clamav && chown -R clamav.root /var/run/clamav