diff --git a/test/docker/archlinux b/test/docker/archlinux
index c6a64822..e7ca7868 100644
--- a/test/docker/archlinux
+++ b/test/docker/archlinux
@@ -3,18 +3,13 @@ FROM archlinux/base
 RUN pacman -Sy --noconfirm archlinux-keyring
 RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm \
-           gnutls \
-           util-linux \
-           bash-completion \
            cmake \
-           python \
-           python-dateutil \
+           gcc \
            git \
-           libfaketime \
-           man-db \
-           groff \
            make \
-           gcc
+           man-db \
+           python \
+           python-dateutil
 
 # Setup language environment
 ENV LANG en_US.UTF-8
diff --git a/test/docker/centos7 b/test/docker/centos7
index 02a2ad49..ba4920f1 100644
--- a/test/docker/centos7
+++ b/test/docker/centos7
@@ -3,17 +3,12 @@ FROM centos:7
 RUN yum update -y
 RUN yum install -y epel-release centos-release-scl
 RUN yum install -y \
-        git \
-        gcc \
-        gcc-c++ \
-        make \
-        gnutls-devel \
-        libuuid-devel \
-        libfaketime \
-        man \
-        which \
         cmake3 \
         devtoolset-7-gcc* \
+        gcc-c++ \
+        git \
+        make \
+        man \
         python36 \
         python36-dateutil
 
diff --git a/test/docker/debianstable b/test/docker/debianstable
index a5c0f76c..a4014176 100644
--- a/test/docker/debianstable
+++ b/test/docker/debianstable
@@ -4,22 +4,16 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
 RUN apt-get install -y \
-            build-essential \
             cmake \
+            g++ \
             git \
-            uuid-dev \
-            libgnutls28-dev \
-            libfaketime \
-            man \
             locales \
+            man \
             python3 \
-            tzdata \
-            python3-dateutil
+            python3-dateutil \
+            tzdata
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-RUN apt-get install -y tzdata
-
 RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 RUN dpkg-reconfigure -f noninteractive tzdata
 
diff --git a/test/docker/debiantesting b/test/docker/debiantesting
index d98a4d47..4f09ff68 100644
--- a/test/docker/debiantesting
+++ b/test/docker/debiantesting
@@ -4,22 +4,16 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
 RUN apt-get install -y \
-            build-essential \
             cmake \
+            g++ \
             git \
-            uuid-dev \
-            libgnutls28-dev \
-            libfaketime \
-            man \
             locales \
-            tzdata \
+            man \
             python3 \
-            python3-dateutil
+            python3-dateutil \
+            tzdata
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-RUN apt-get install -y tzdata
-
 RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime
 RUN dpkg-reconfigure -f noninteractive tzdata
 
diff --git a/test/docker/fedora28 b/test/docker/fedora28
index ea074d46..a3d5df66 100644
--- a/test/docker/fedora28
+++ b/test/docker/fedora28
@@ -2,17 +2,13 @@ FROM fedora:28
 
 RUN dnf update -y
 RUN dnf install -y \
-        python3 \
-        python3-dateutil \
-        git \
-        gcc \
-        gcc-c++ \
         cmake \
+        gcc-c++ \
+        git \
         make \
-        gnutls-devel \
-        libuuid-devel \
-        libfaketime \
-        man
+        man \
+        python3 \
+        python3-dateutil
 
 RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
 
diff --git a/test/docker/fedora29 b/test/docker/fedora29
index e05b25d8..5c3dcc54 100644
--- a/test/docker/fedora29
+++ b/test/docker/fedora29
@@ -2,17 +2,13 @@ FROM fedora:29
 
 RUN dnf update -y
 RUN dnf install -y \
-        python3 \
-        python3-dateutil \
-        git \
-        gcc \
-        gcc-c++ \
         cmake \
+        gcc-c++ \
+        git \
         make \
-        gnutls-devel \
-        libuuid-devel \
-        libfaketime \
-        man
+        man \
+        python3 \
+        python3-dateutil
 
 RUN alternatives --install /usr/bin/python python /usr/bin/python3 10
 
diff --git a/test/docker/gentoo b/test/docker/gentoo
index 89d8b4bb..3fd3b323 100644
--- a/test/docker/gentoo
+++ b/test/docker/gentoo
@@ -5,16 +5,15 @@ FROM gentoo/stage3-x86:latest
 COPY --from=gentoo/portage:latest /var/db/repos/gentoo /var/db/repos/gentoo
 
 RUN (CNT=60 ; while [[ ${CNT} -ne 0 ]] ; do echo "RUNNING (${CNT})" ; sleep 60 ; ((CNT--)) ; done ) & \
-    emerge -qv sys-libs/readline:0 \
-               net-libs/gnutls:0= \
-               sys-apps/util-linux \
-               dev-util/cmake \
-               dev-lang/python \
-               dev-python/python-dateutil \
-               sys-devel/make \
-               dev-vcs/git \
-               sys-libs/libfaketime \
-               sys-apps/man-db ; \
+    emerge -qv \
+           dev-util/cmake \
+           dev-vcs/git \
+           sys-devel/make \
+           sys-apps/man-db \
+           dev-lang/python \
+           dev-python/python-dateutil \
+           sys-libs/readline:0 \
+           sys-apps/util-linux ; \
     kill %1
 
 # Setup language environment
diff --git a/test/docker/opensuse1500 b/test/docker/opensuse1500
index 8f11011a..2fc58e98 100644
--- a/test/docker/opensuse1500
+++ b/test/docker/opensuse1500
@@ -1,19 +1,14 @@
 FROM opensuse/leap:15
 
 RUN zypper install -y \
-           python3 \
-           python3-dateutil \
-           awk \
-           coreutils \
-           git \
-           gcc \
-           gcc-c++ \
            cmake \
+           coreutils \
+           gcc-c++ \
+           git \
            make \
-           libgnutls-devel \
-           libuuid-devel \
-           libfaketime \
-           man
+           man \
+           python3 \
+           python3-dateutil
 
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
 
diff --git a/test/docker/ubuntu1604 b/test/docker/ubuntu1604
index be51b75c..a54ddbf2 100644
--- a/test/docker/ubuntu1604
+++ b/test/docker/ubuntu1604
@@ -4,14 +4,11 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
 RUN apt-get install -y \
-            build-essential \
             cmake \
+            g++ \
             git \
-            uuid-dev \
-            libgnutls28-dev \
-            libfaketime \
-            man \
             locales \
+            man \
             python3 \
             python3-dateutil \
             tzdata
diff --git a/test/docker/ubuntu1804 b/test/docker/ubuntu1804
index 1d5df9ed..996f82d2 100644
--- a/test/docker/ubuntu1804
+++ b/test/docker/ubuntu1804
@@ -4,14 +4,11 @@ ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update
 RUN apt-get install -y \
-            build-essential \
             cmake \
+            g++ \
             git \
-            uuid-dev \
-            libgnutls28-dev \
-            libfaketime \
-            man \
             locales \
+            man \
             python3 \
             python3-dateutil \
             tzdata