diff --git a/.gitlab/testbed.yml b/.gitlab/testbed.yml
index 4cb86fbf51..6f0f215a2e 100644
--- a/.gitlab/testbed.yml
+++ b/.gitlab/testbed.yml
@@ -56,6 +56,10 @@
     - sudo ip link set $TESTBED_WAN_INTERFACE up 2> /dev/null
     - sleep 10
 
+    - sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
+    - sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
+    - sudo apt-get update && sudo apt-get install --yes --no-install-recommends minidlna avahi-daemon avahi-utils dbus
+
     - mkdir -p ~/.ssh; chmod 700 ~/.ssh
     - >
       if echo "$CI_RUNNER_DESCRIPTION" | grep -q testbed-01; then
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/066-gmap-mod-upnp.t b/.gitlab/tests/cram/generic/acceleration-plan-components/066-gmap-mod-upnp.t
index 04cae4f4c4..282bf2d8b0 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/066-gmap-mod-upnp.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/066-gmap-mod-upnp.t
@@ -2,12 +2,6 @@ Create R alias:
 
   $ alias R="${CRAM_REMOTE_COMMAND:-}"
 
-Install minidlna if not already present:
-
-  $ sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
-  $ sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
-  $ which minidlnad >/dev/null 2>&1 || (sudo apt-get update >/dev/null 2>&1 && sudo apt-get install -y minidlna >/dev/null 2>&1)
-
 Test 1: Service Advertisement (start minidlna):
 
 Create minidlna configuration:
diff --git a/.gitlab/tests/cram/generic/acceleration-plan-components/068-gmap-mod-dnssd.t b/.gitlab/tests/cram/generic/acceleration-plan-components/068-gmap-mod-dnssd.t
index 2e56f4412a..4332a7277a 100644
--- a/.gitlab/tests/cram/generic/acceleration-plan-components/068-gmap-mod-dnssd.t
+++ b/.gitlab/tests/cram/generic/acceleration-plan-components/068-gmap-mod-dnssd.t
@@ -1,12 +1,6 @@
 Create R alias:
   $ alias R="${CRAM_REMOTE_COMMAND:-}"
 
-Install avahi if not already present:
-
-  $ sudo sed -i 's|http://deb.debian.org/debian|http://archive.debian.org/debian|g' /etc/apt/sources.list 2>/dev/null
-  $ sudo sed -i 's|http://deb.debian.org/debian-security|http://archive.debian.org/debian-security|g' /etc/apt/sources.list 2>/dev/null
-  $ which avahi-daemon >/dev/null 2>&1 || (sudo apt-get update >/dev/null 2>&1 && sudo apt-get install -y avahi-daemon avahi-utils dbus >/dev/null 2>&1)
-
 Ensure avahi-daemon is running:
 
   $ sudo service dbus start 2>&1 | grep -v "unable to resolve host" | tee /dev/stderr | grep -q "Starting system message bus: dbus." && echo "dbus started OK" || echo "dbus may have failed to start"