diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 29c34a4e..a49aed0a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,19 +5,19 @@ image: debian:buster
 before_script:
   - uname -a
 
-pngcheck:
+.pngcheck:
   stage: test
   script:
   - ./.tools/pngcheck.sh
   #allow_failure: true
 
-imagemagiccheck:
+.imagemagiccheck:
   stage: test
   script:
   - ./.tools/imagemagiccheck.sh
   allow_failure: true
 
-manaplus:
+.manaplus:
   stage: test
   script:
   - ./.tools/manaplus.sh
@@ -29,7 +29,7 @@ manaplus:
     expire_in: 3 week
   allow_failure: true
 
-newlines:
+.newlines:
   stage: test
   tags:
   - lightweight
@@ -42,7 +42,7 @@ newlines:
     expire_in: 3 week
   #allow_failure: true
 
-licensecheck:
+.licensecheck:
   stage: test
   tags:
   - lightweight
diff --git a/.tools/init.sh b/.tools/init.sh
index 4fe533ef..7a0d3eb1 100755
--- a/.tools/init.sh
+++ b/.tools/init.sh
@@ -18,10 +18,18 @@ function gitclone1 {
     return $?
 }
 
+# First try cloning $2 into $3 from this repository's
+# project space, then use provided fallback space ($1).
 function gitclone {
-    export name1=$1/$2
-    export name2=${CI_BUILD_REPO##*@}
-    export name2=https://${name2%/*}/$2
+    printf '$CI_BUILD_REPO is %s\n' "$CI_BUILD_REPO"
+    printf '$CI_REPOSITORY_URL is %s\n' "$CI_REPOSITORY_URL"
+    printf '$CI_PROJECT_URL is %s\n' "$CI_PROJECT_URL"
+    local name1=$1/$2
+    # Format https://gitlab-ci-token:$CI_JOB_TOKEN@gitlab.example.com/my-group/my-project.git
+    # strip token part
+    local name2=${CI_REPOSITORY_URL##*@}
+    # Strip URL down to namespace and append the project we want
+    local name2=https://${name2%/*}/$2
 
     gitclone1 "$name1" "$name2" $3
     if [ "$?" != 0 ]; then
diff --git a/.tools/testxml.sh b/.tools/testxml.sh
index a0dc16b3..9982554b 100755
--- a/.tools/testxml.sh
+++ b/.tools/testxml.sh
@@ -16,7 +16,7 @@ check_error $?
 export RES=$(cat errors.txt)
 if [[ -n "${RES}" ]]; then
     echo "xml check failed" >../../../clientdata/shared/error.log
-    echo ${RES} >>../../../clientdata/shared/error.log
+    cat errors.txt >>../../../clientdata/shared/error.log
     cat ../../../clientdata/shared/error.log
     exit 1
 fi