diff --git a/tests/docker/conf.json b/tests/docker/conf.json
index 983b532..cc01eb7 100644
--- a/tests/docker/conf.json
+++ b/tests/docker/conf.json
@@ -1,34 +1,46 @@
 {
     "tests" : [
         {
             "name" : "ubuntu-18.04",
             "url" : "iamsergio/clazy-ubuntu-18.04",
             "llvm_root" : "/usr/lib/llvm-6.0/",
             "comment" : "llvm-6;Qt-5.9.5"
         },
         {
             "name" : "ubuntu-18.04",
             "url" : "iamsergio/clazy-ubuntu-18.04",
             "llvm_root" : "/usr/lib/llvm-7",
             "comment" : "llvm-7;Qt-5.9.5"
         },
         {
             "name" : "ubuntu-18.04",
             "url" : "iamsergio/clazy-ubuntu-18.04",
             "llvm_root" : "/usr/lib/llvm-8",
             "comment" : "llvm-8;Qt-5.9.5"
         },
         {
             "name" : "debian-unstable",
             "url" : "iamsergio/clazy-debian-unstable",
             "llvm_root" : "/usr/lib/llvm-9",
             "comment" : "llvm-9;Qt-5.11.3"
         },
         {
             "name" : "archlinux",
             "url" : "iamsergio/clazy-archlinux",
             "llvm_root" : "/usr",
             "comment" : "llvm-8;Qt-5.13.1"
+        },
+        {
+            "name" : "opensuse-leap",
+            "url" : "iamsergio/clazy-opensuse-leap",
+            "llvm_root" : "/usr",
+            "comment" : "llvm-7;Qt-5.9.7"
+        },
+        {
+            "name" : "fedora-31",
+            "url" : "iamsergio/clazy-fedora-31",
+            "llvm_root" : "/usr",
+            "comment" : "llvm-9;Qt-5.12.5"
         }
     ]
 }
diff --git a/tests/docker/images/clazy-fedora-31/Dockerfile b/tests/docker/images/clazy-fedora-31/Dockerfile
new file mode 100644
index 0000000..54caa48
--- /dev/null
+++ b/tests/docker/images/clazy-fedora-31/Dockerfile
@@ -0,0 +1,12 @@
+# This Dockerfile creates the container for testing on Fedora
+# You can run, for example: clazy/tests/docker/test_docker.py -b 1.6 , which will run the tests in all containers
+# Or explicitly: docker run -i -t iamsergio/clazy-fedora-31 sh /root/clazy/tests/docker/build-clazy.sh 1.6 -j12 none /usr
+
+FROM fedora:31
+MAINTAINER Sergio Martins (sergio.martins@kdab.com)
+
+RUN yum -y update
+RUN yum -y install make cmake git ninja-build gcc llvm-devel clang-devel qt5-qtbase-devel qt5-qtdeclarative-devel
+
+WORKDIR /root
+RUN git clone https://github.com/KDE/clazy.git
diff --git a/tests/docker/images/clazy-opensuse-leap/Dockerfile b/tests/docker/images/clazy-opensuse-leap/Dockerfile
new file mode 100644
index 0000000..cb87ed1
--- /dev/null
+++ b/tests/docker/images/clazy-opensuse-leap/Dockerfile
@@ -0,0 +1,12 @@
+# This Dockerfile creates the container for testing on Opensuse leap
+# You can run, for example: clazy/tests/docker/test_docker.py -b 1.6 , which will run the tests in all containers
+# Or explicitly: docker run -i -t iamsergio/clazy-opensuse-leap sh /root/clazy/tests/docker/build-clazy.sh 1.6 -j12 none /usr
+
+FROM opensuse/leap
+MAINTAINER Sergio Martins (sergio.martins@kdab.com)
+
+RUN zypper update
+RUN zypper -n install cmake git-core llvm llvm-devel llvm-clang llvm-clang-devel libqt5-qtbase-devel libqt5-qtdeclarative-devel
+
+WORKDIR /root
+RUN git clone https://github.com/KDE/clazy.git