6 files changed, 6 insertions, 48 deletions
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
new file mode 100644
index 00000000..200f9182
--- /dev/null
+++ b/test/docker/Dockerfile
@@ -0,0 +1,6 @@
+ARG DIST
+FROM vskytta/bash-completion:$DIST
+
+WORKDIR /work
+COPY . .
+CMD ["test/docker/docker-script.sh"]
diff --git a/test/docker/Dockerfile-centos6 b/test/docker/Dockerfile-centos6
deleted file mode 100644
index 6f886ffa..00000000
--- a/test/docker/Dockerfile-centos6
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM vskytta/bash-completion:centos6
-
-# When adding new completions, install packages desired for their testing here
-# in case they're not in the base image, and remove later when the base image
-# has caught up.
-#RUN yum -y install \
-#        some-package
-
-WORKDIR /work
-COPY . .
-CMD ["bash"]
diff --git a/test/docker/Dockerfile-fedoradev b/test/docker/Dockerfile-fedoradev
deleted file mode 100644
index 8c4f86d7..00000000
--- a/test/docker/Dockerfile-fedoradev
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM vskytta/bash-completion:fedoradev
-
-# When adding new completions, install packages desired for their testing here
-# in case they're not in the base image, and remove later when the base image
-# has caught up.
-#RUN dnf --nogpgcheck --refresh -y install \
-#        some-package
-
-WORKDIR /work
-COPY . .
-CMD ["bash"]
diff --git a/test/docker/Dockerfile-tools b/test/docker/Dockerfile-tools
deleted file mode 100644
index 2328808e..00000000
--- a/test/docker/Dockerfile-tools
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM vskytta/bash-completion:tools
-
-COPY . .
diff --git a/test/docker/Dockerfile-ubuntu14 b/test/docker/Dockerfile-ubuntu14
deleted file mode 100644
index a1086add..00000000
--- a/test/docker/Dockerfile-ubuntu14
+++ /dev/null
@@ -1,13 +0,0 @@
-FROM vskytta/bash-completion:ubuntu14
-
-# When adding new completions, install packages desired for their testing here
-# in case they're not in the base image, and remove later when the base image
-# has caught up.
-#RUN apt-get update \
-#    && \
-#    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-#        some-package
-
-WORKDIR /work
-COPY . .
-CMD ["bash"]
diff --git a/test/docker/docker-script.sh b/test/docker/docker-script.sh
index ec310b35..681f2429 100755
--- a/test/docker/docker-script.sh
+++ b/test/docker/docker-script.sh
@@ -20,15 +20,6 @@ if [ "$BSD" ]; then
     export PATH
 fi
 
-case $DIST in
-    centos6|ubuntu14)
-        : ${PYTEST:=/root/.local/bin/pytest}
-        ;;
-    *)
-        : ${PYTEST:=pytest-3}
-        ;;
-esac
-
 export bashcomp_bash=bash
 env
 
@@ -37,6 +28,5 @@ autoreconf -i
 make -j
 
 xvfb-run make distcheck \
-    PYTEST=$PYTEST \
     PYTESTFLAGS="--numprocesses=auto --dist=loadfile" \
     RUNTESTFLAGS="--all --verbose"