diff --git a/builder/dockerfile.fedora_thirtythree.barebones.rpm.test b/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
new file mode 100644
index 0000000..d9ab4d7
--- /dev/null
+++ b/builder/dockerfile.fedora_thirtythree.barebones.rpm.test
@@ -0,0 +1,18 @@
+FROM fedora:33
+
+RUN dnf install -y xterm
+RUN dnf install -y vim less
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/*.rpm /tmp
+RUN dnf localinstall -y /tmp/*.rpm
+
+RUN useradd -m foo
+
+USER foo:kasmvnc
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
+
+ENTRYPOINT bash -c "vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/pki/tls/private/kasmvnc.pem -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
diff --git a/builder/dockerfile.ubuntu_focal.barebones.deb.test b/builder/dockerfile.ubuntu_focal.barebones.deb.test
new file mode 100644
index 0000000..4449d77
--- /dev/null
+++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test
@@ -0,0 +1,16 @@
+FROM ubuntu:focal
+
+ARG KASMVNC_PACKAGE_DIR
+COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp
+RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install
+RUN apt-get update && apt-get -y install xterm lsb-release
+
+RUN useradd -m foo && addgroup foo ssl-cert
+
+USER foo
+
+RUN mkdir ~/.vnc && echo '/usr/bin/xterm &' >> ~/.vnc/xstartup && \
+  chmod +x ~/.vnc/xstartup
+RUN echo bar | kasmvncpasswd -f > $HOME/.kasmpasswd && chmod 0600 $HOME/.kasmpasswd
+
+ENTRYPOINT bash -c "vncserver :1 -interface 0.0.0.0 && vncserver -kill :1 && vncserver :1 -depth 24 -geometry 1280x1050 -websocketPort 8443 -cert /etc/ssl/certs/ssl-cert-snakeoil.pem -key /etc/ssl/private/ssl-cert-snakeoil.key -sslOnly -FrameRate=24 -interface 0.0.0.0 -httpd /usr/share/kasmvnc/www && tail -f $HOME/.vnc/*.log "
diff --git a/builder/test-deb-barebones b/builder/test-deb-barebones
index 36010bb..37f9e1b 100755
--- a/builder/test-deb-barebones
+++ b/builder/test-deb-barebones
@@ -3,8 +3,8 @@
 set -e
 
 cd "$(dirname "$0")"
-os="debian"
-os_codename="buster"
+os="${1:-debian}"
+os_codename="${2:-buster}"
 
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os_codename}" \
   -t kasmvnctester_barebones_${os}:$os_codename \
diff --git a/builder/test-rpm-barebones b/builder/test-rpm-barebones
index e8ba9cd..68ec718 100755
--- a/builder/test-rpm-barebones
+++ b/builder/test-rpm-barebones
@@ -3,8 +3,8 @@
 set -e
 
 cd "$(dirname "$0")"
-os="centos"
-os_codename="core"
+os="${1:-centos}"
+os_codename="${2:-core}"
 
 docker build --build-arg KASMVNC_PACKAGE_DIR="build/${os}_${os_codename}" \
   -t kasmvnctester_barebones_${os}:$os_codename \