diff --git a/builder/dockerfile.ubuntu_focal.barebones.deb.test b/builder/dockerfile.ubuntu_focal.barebones.deb.test
index 9b16154..d9effe0 100644
--- a/builder/dockerfile.ubuntu_focal.barebones.deb.test
+++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test
@@ -2,9 +2,13 @@ FROM ubuntu:focal
 
 ENV STARTUPDIR=/dockerstartup
 
+COPY ./builder/scripts/ /tmp/scripts/
+COPY ./debian/changelog /tmp
+
 ARG KASMVNC_PACKAGE_DIR
 COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/
-RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
+RUN /tmp/scripts/install_kasmvncserver_package
+
 RUN apt-get update && apt-get -y install xterm lsb-release
 
 RUN mkdir -p $STARTUPDIR
diff --git a/builder/test-deb-barebones b/builder/test-deb-barebones
index d29978e..9ffdb5d 100755
--- a/builder/test-deb-barebones
+++ b/builder/test-deb-barebones
@@ -3,6 +3,7 @@
 set -e
 
 cd "$(dirname "$0")/.."
+. ./builder/process_test_options.sh
 . ./builder/common.sh
 os="${1:-debian}"
 os_codename="${2:-buster}"
@@ -13,4 +14,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="builder/build/${os_codename}" \
 echo
 docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
   -e "VNC_PORT=$VNC_PORT" \
-  kasmvnctester_barebones_${os}:$os_codename
+  $entrypoint_executable \
+  kasmvnctester_barebones_${os}:$os_codename \
+  $entrypoint_args
diff --git a/builder/test-rpm-barebones b/builder/test-rpm-barebones
index b804a75..6318bda 100755
--- a/builder/test-rpm-barebones
+++ b/builder/test-rpm-barebones
@@ -3,6 +3,7 @@
 set -e
 
 cd "$(dirname "$0")"
+. ./process_test_options.sh
 . ./common.sh
 os="${1:-centos}"
 os_codename="${2:-core}"
@@ -12,4 +13,6 @@ docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
   -f dockerfile.${os}_${os_codename}.barebones.rpm.test .
 docker run -it -p "443:$VNC_PORT" --rm -e "VNC_USER=foo" -e "VNC_PW=foobar" \
   -e "VNC_PORT=$VNC_PORT" \
-  kasmvnctester_barebones_${os}:$os_codename
+  $entrypoint_executable \
+  kasmvnctester_barebones_${os}:$os_codename \
+  $entrypoint_args