diff --git a/Dockerfile-functional-tester b/Dockerfile-functional-tester
index 5c11d07cf..34a1f8941 100644
--- a/Dockerfile-functional-tester
+++ b/Dockerfile-functional-tester
@@ -1,27 +1,14 @@
-FROM ubuntu:17.10
+FROM fedora:28
 
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-RUN apt-get -y update \
-  && apt-get -y install \
-  build-essential \
-  gcc \
-  apt-utils \
-  pkg-config \
-  software-properties-common \
-  apt-transport-https \
-  libssl-dev \
-  sudo \
-  bash \
-  curl \
-  wget \
-  tar \
-  git \
-  && apt-get -y update \
-  && apt-get -y upgrade \
-  && apt-get -y autoremove \
-  && apt-get -y autoclean
+RUN dnf check-update || true \
+  && dnf install --assumeyes \
+  git curl wget mercurial meld gcc gcc-c++ which \
+  gcc automake autoconf dh-autoreconf libtool libtool-ltdl \
+  tar unzip gzip \
+  && dnf check-update || true \
+  && dnf upgrade --assumeyes || true \
+  && dnf autoremove --assumeyes || true \
+  && dnf clean all || true
 
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
diff --git a/Dockerfile-test b/Dockerfile-test
index fd7a61470..70ee40d40 100644
--- a/Dockerfile-test
+++ b/Dockerfile-test
@@ -1,33 +1,16 @@
-FROM ubuntu:17.10
+FROM fedora:28
 
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-
-RUN apt-get -y update \
-  && apt-get -y install \
-  build-essential \
-  gcc \
-  apt-utils \
-  pkg-config \
-  software-properties-common \
-  apt-transport-https \
-  libssl-dev \
-  sudo \
-  bash \
-  curl \
-  wget \
-  tar \
-  git \
-  netcat \
-  libaspell-dev \
-  libhunspell-dev \
-  hunspell-en-us \
-  aspell-en \
-  shellcheck \
-  && apt-get -y update \
-  && apt-get -y upgrade \
-  && apt-get -y autoremove \
-  && apt-get -y autoclean
+RUN dnf check-update || true \
+  && dnf install --assumeyes \
+  git curl wget mercurial meld gcc gcc-c++ which \
+  gcc automake autoconf dh-autoreconf libtool libtool-ltdl \
+  tar unzip gzip \
+  aspell-devel aspell-en hunspell hunspell-devel hunspell-en hunspell-en-US ShellCheck || true \
+  && dnf check-update || true \
+  && dnf upgrade --assumeyes || true \
+  && dnf autoremove --assumeyes || true \
+  && dnf clean all || true \
+  && dnf reinstall which || true
 
 ENV GOROOT /usr/local/go
 ENV GOPATH /go
@@ -44,6 +27,10 @@ WORKDIR ${GOPATH}/src/github.com/coreos/etcd
 
 ADD ./scripts/install-marker.sh /tmp/install-marker.sh
 
+# manually link "goword" dependency
+# ldconfig -v | grep hunspell
+RUN ln -s /lib64/libhunspell-1.6.so /lib64/libhunspell.so
+
 RUN go get -v -u -tags spell github.com/chzchzchz/goword \
   && go get -v -u github.com/coreos/license-bill-of-materials \
   && go get -v -u honnef.co/go/tools/cmd/gosimple \