diff --git a/test/conftest.py b/test/conftest.py
index 7ec3832e..58530d38 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -71,7 +71,7 @@ def args(request):
     return '-t -d'
 
 
-@pytest.fixture(params=['debian', 'centos'])
+@pytest.fixture(params=['debian', 'centos', 'fedora'])
 def tag(request):
     '''
     consumed by image to make the test matrix
diff --git a/test/fedora.Dockerfile b/test/fedora.Dockerfile
new file mode 100644
index 00000000..c4834388
--- /dev/null
+++ b/test/fedora.Dockerfile
@@ -0,0 +1,16 @@
+FROM fedora:latest
+
+ENV GITDIR /etc/.pihole
+ENV SCRIPTDIR /opt/pihole
+
+RUN mkdir -p $GITDIR $SCRIPTDIR /etc/pihole
+ADD . $GITDIR
+RUN cp $GITDIR/advanced/Scripts/*.sh $GITDIR/gravity.sh $GITDIR/pihole $GITDIR/automated\ install/*.sh $SCRIPTDIR/
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:$SCRIPTDIR
+
+RUN true && \
+    chmod +x $SCRIPTDIR/*
+
+ENV PH_TEST true
+
+#sed '/# Start the installer/Q' /opt/pihole/basic-install.sh > /opt/pihole/stub_basic-install.sh && \
diff --git a/test/test_000_build_containers.py b/test/test_000_build_containers.py
index dc365026..ad243754 100644
--- a/test/test_000_build_containers.py
+++ b/test/test_000_build_containers.py
@@ -10,6 +10,7 @@ run_local = testinfra.get_backend(
 @pytest.mark.parametrize("image,tag", [
     ('test/debian.Dockerfile', 'pytest_pihole:debian'),
     ('test/centos.Dockerfile', 'pytest_pihole:centos'),
+    ('test/fedora.Dockerfile', 'pytest_pihole:fedora'),
 ])
 def test_build_pihole_image(image, tag):
     build_cmd = run_local('docker build -f {} -t {} .'.format(image, tag))