rename from testing/docker/ubuntu1604-test/system-setup.sh
rename to testing/docker/recipes/ubuntu1604-test-system-setup.sh
--- a/testing/docker/ubuntu1604-test/system-setup.sh
+++ b/testing/docker/recipes/ubuntu1604-test-system-setup.sh
@@ -172,9 +172,9 @@ apt-get -q -y -f install \
 cp sources.list.orig /etc/apt/sources.list
 apt-get update
 
 # clean up
 cd /
 rm -rf /setup ~/.ccache ~/.cache ~/.npm
 apt-get clean
 apt-get autoclean
-rm $0
+rm -f $0

--- a/testing/docker/ubuntu1604-test/Dockerfile
+++ b/testing/docker/ubuntu1604-test/Dockerfile
@@ -5,19 +5,19 @@ RUN useradd -d /home/worker -s /bin/bash
 WORKDIR /home/worker
 
 # %include testing/docker/recipes/tooltool.py
 ADD topsrcdir/testing/docker/recipes/tooltool.py /setup/tooltool.py
 
 # %include testing/docker/recipes/install-mercurial.sh
 ADD topsrcdir/testing/docker/recipes/install-mercurial.sh /setup/install-mercurial.sh
 
-# install non-build specific dependencies in a single layer
-ADD           system-setup.sh   /tmp/system-setup.sh
-RUN           bash /tmp/system-setup.sh
+# %include testing/docker/recipes/ubuntu1604-test-system-setup.sh
+ADD topsrcdir/testing/docker/recipes/ubuntu1604-test-system-setup.sh /setup/system-setup.sh
+RUN           bash /setup/system-setup.sh
 
 # %include testing/docker/recipes/run-task
 ADD topsrcdir/testing/docker/recipes/run-task /home/worker/bin/run-task
 
 # Set variable normally configured at login, by the shells parent process, these
 # are taken from GNU su manual
 ENV           HOME          /home/worker
 ENV           SHELL         /bin/bash