diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aea62f2c2888786793965d7f78dfe5a25d45516a..c0a7b74398b7757a492ad4caab101c5a8ea08370 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,6 +59,8 @@ test-job:
   script:
     - ls -lha /exlibris/
     - ROSETTASDK=$ROSETTASDK make check_prerequisites
+    - mkdir -p /var/run/clamav
+    - chown -R clamav.clamav /var/run/clamav
     - /usr/sbin/clamd --debug || cat /var/log/clamav/clamav.log
     - ROSETTASDK=$ROSETTASDK make test
 
diff --git a/gitlab-ci/Dockerfile b/gitlab-ci/Dockerfile
index 05bbf91fcd947ac7b2fbd0d1f9638b9c9e0b7f94..e56ea89d24d2a555b36f70815a0149df6c66b2d9 100644
--- a/gitlab-ci/Dockerfile
+++ b/gitlab-ci/Dockerfile
@@ -27,6 +27,4 @@ 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
 RUN echo TCPAddr 127.0.0.1 >> /etc/clamav/clamd.conf
-RUN mkdir -p /var/run/clamav
-RUN chown -R clamav.clamav /var/run/clamav
 RUN /usr/bin/freshclam