diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5595db0..9f96fa3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,39 +26,27 @@ build:
 
 test:
   stage: test
-  variables:
-    CI_CONFIG_PATH: debian/.gitlab-ci.yml
   script:
-    - echo Testing ${RELEASE_IMAGE}
-    - docker pull ${GITLAB_RUNNER_IMAGE}
-    - docker run --rm --interactive
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        ${GITLAB_RUNNER_IMAGE}
-        exec docker --help
+    - echo Testing ${TEST_IMAGE}
     - git clone https://salsa.debian.org/debian/pidcat.git
     - cd pidcat
     - printf
-        "image\x3a ${TEST_IMAGE}\n\ntest:\n  script:\n    - /gitlab-ci-git-buildpackage\n"
-        > $CI_CONFIG_PATH
-    - git add $CI_CONFIG_PATH
-    - git config user.name $GITLAB_USER_NAME
-    - git config user.email $GITLAB_USER_EMAIL
-    - git commit $CI_CONFIG_PATH -m $CI_CONFIG_PATH
-    - cat $CI_CONFIG_PATH
+        "image\x3a ${TEST_IMAGE}\n\ntest:\n  script:\n    - git remote set-url origin https://salsa.debian.org/debian/pidcat.git\n    - /usr/bin/gitlab-ci-git-buildpackage\n"
+        > .gitlab-ci.yml
+    - docker pull ${TEST_IMAGE}
     - docker run --rm --interactive
         --volume /var/run/docker.sock:/var/run/docker.sock
         --volume $PWD:$PWD --workdir $PWD
-        --env "CI_CONFIG_PATH=$CI_CONFIG_PATH"
         ${GITLAB_RUNNER_IMAGE}
         exec docker
           --docker-volumes "/var/run/docker.sock:/var/run/docker.sock"
+          --docker-pull-policy never
           --env "HOSTNAME=$HOSTNAME"
           --env "CI_PROJECT_NAMESPACE=debian"
           --env "CI_PROJECT_NAME=pidcat"
           --env "CI_COMMIT_REF_NAME=`git symbolic-ref HEAD --short`"
           --env "CI_COMMIT_SHA=`git rev-parse HEAD`"
-          --env "CI_CONFIG_PATH=$CI_CONFIG_PATH"
-          test || true
+          test
 
 release:
   stage: release