diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index e62a55e7a53..c129bc8be87 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -26,7 +26,6 @@
 
 FROM debian:stretch as emacs-base
 
-RUN cat /proc/sys/kernel/core_pattern
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
       libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 15327b00281..30efe89c067 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -75,11 +75,13 @@ default:
         - autogen.sh
         - configure.ac
         - lib/*.{h,c}
-        - lisp/**.el
+        - lisp/*.el
+        - lisp/**/*.el
         - src/*.{h,c}
         - test/infra/*
         - test/lib-src/*.el
-        - test/lisp/**.el
+        - test/lisp/*.el
+        - test/lisp/**/*.el
         - test/src/*.el
     - changes:
         # gfilemonitor, kqueue
@@ -107,7 +109,7 @@ default:
     # TODO: with make -j4 several of the tests were failing, for
     # example shadowfile-tests, but passed without it.
     - 'export PWD=$(pwd)'
-    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && timeout 3600s make ${make_params}"'
+    - 'docker run -i -e EMACS_EMBA_CI=${EMACS_EMBA_CI} --volumes-from $(docker ps -q -f "label=com.gitlab.gitlab-runner.job.id=${CI_JOB_ID}"):ro --name ${test_name} ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG} /bin/bash -c "git fetch ${PWD} HEAD && echo checking out these updated files && git diff --name-only FETCH_HEAD && ( git diff --name-only FETCH_HEAD | xargs git checkout -f FETCH_HEAD ) && make -j4 && timeout -s ABRT 1800s make ${make_params}"'
   after_script:
     # - docker ps -a
     # - printenv
@@ -156,7 +158,9 @@ default:
     public: true
     expire_in: 1 week
     paths:
-      - "**.log"
+      - "**/*.log"
+      - "**/core"
+      - core
 
 .gnustep-template:
   rules: