diff --git a/tests/docker/conf.json b/tests/docker/conf.json
index 4f201f0..983b532 100644
--- a/tests/docker/conf.json
+++ b/tests/docker/conf.json
@@ -1,22 +1,34 @@
 {
     "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"
         }
     ]
 }
diff --git a/tests/docker/images/clazy-archlinux/Dockerfile b/tests/docker/images/clazy-archlinux/Dockerfile
new file mode 100644
index 0000000..377c1b1
--- /dev/null
+++ b/tests/docker/images/clazy-archlinux/Dockerfile
@@ -0,0 +1,12 @@
+# This Dockerfile creates the container for testing on Archlinux
+# 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-archlinux sh /root/clazy/tests/docker/build-clazy.sh 1.6 -j12 none /usr
+
+FROM archlinux/base
+MAINTAINER Sergio Martins (sergio.martins@kdab.com)
+
+RUN pacman -Syu --noconfirm
+RUN pacman -S git cmake ninja make gcc python3 clang llvm qt5-base qt5-declarative --noconfirm
+
+WORKDIR /root
+RUN git clone https://github.com/KDE/clazy.git
diff --git a/tests/docker/images/clazy-debian-unstable/Dockerfile b/tests/docker/images/clazy-debian-unstable/Dockerfile
new file mode 100644
index 0000000..9c3d0af
--- /dev/null
+++ b/tests/docker/images/clazy-debian-unstable/Dockerfile
@@ -0,0 +1,12 @@
+# This Dockerfile creates the container for testing on Debian
+# 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-debian-unstable sh /root/clazy/tests/docker/build-clazy.sh 1.6 -j12 none /usr/lib/llvm-9/
+
+FROM debian:unstable
+MAINTAINER Sergio Martins (sergio.martins@kdab.com)
+
+RUN apt-get update
+RUN apt install -y g++ cmake clang-9 clang-tools-9 libclang-9-dev git-core python3 ninja-build qtbase5-dev qtdeclarative5-dev
+
+WORKDIR /root
+RUN git clone https://github.com/KDE/clazy.git