diff --git a/tests/docker/conf.json b/tests/docker/conf.json
index 344c744..4f201f0 100644
--- a/tests/docker/conf.json
+++ b/tests/docker/conf.json
@@ -1,40 +1,22 @@
 {
     "tests" : [
         {
             "name" : "ubuntu-18.04",
             "url" : "iamsergio/clazy-ubuntu-18.04",
-            "prefix" : "/usr/",
+            "llvm_root" : "/usr/lib/llvm-6.0/",
             "comment" : "llvm-6;Qt-5.9.5"
         },
         {
-            "name" : "opensuse-tumbleweed",
-            "url" : "iamsergio/clazy-opensuse-tumbleweed",
-            "prefix" : "/usr/",
-            "comment" : "llvm-6;Qt-5.11.1"
-        },
-        {
-            "name" : "debian-unstable-llvm5",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-5.0/",
-            "llvm_root" : "/usr/lib/llvm-5.0/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm5;Qt-5.11.1"
-        },
-        {
-            "name" : "debian-unstable-llvm6",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-6.0/",
-            "llvm_root" : "/usr/lib/llvm-6.0/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm6;Qt-5.11.1"
+            "name" : "ubuntu-18.04",
+            "url" : "iamsergio/clazy-ubuntu-18.04",
+            "llvm_root" : "/usr/lib/llvm-7",
+            "comment" : "llvm-7;Qt-5.9.5"
         },
         {
-            "name" : "debian-unstable-llvm7",
-            "url" : "iamsergio/clazy-debian-unstable",
-            "prefix" : "/usr/lib/llvm-7/",
-            "llvm_root" : "/usr/lib/llvm-7/",
-            "ignore_checks" : "qcolor-from-literal",
-            "comment" : "llvm7;Qt-5.11.1"
+            "name" : "ubuntu-18.04",
+            "url" : "iamsergio/clazy-ubuntu-18.04",
+            "llvm_root" : "/usr/lib/llvm-8",
+            "comment" : "llvm-8;Qt-5.9.5"
         }
     ]
 }
diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py
index 463ed3f..4ee3d62 100755
--- a/tests/docker/test_docker.py
+++ b/tests/docker/test_docker.py
@@ -1,82 +1,79 @@
 #!/usr/bin/env python2
 
 import sys, os, json, argparse
 
 JSON_CONFIG_FILENAME = os.path.dirname(sys.argv[0]) + '/conf.json'
 MAKEFLAGS = "-j12"
 BRANCH = 'master'
 BUILD_SCRIPT = '/root/clazy/tests/docker/build-clazy.sh'
 
 class DockerTest:
     def __init__(self, name, url):
         self.name = name
         self.url = url
-        self.prefix = '/opt/clazy'
         self.ignore_checks = 'none'
         self.llvm_root = 'none'
 
 def read_json_config():
     dockerTests = []
 
     if not os.path.exists(JSON_CONFIG_FILENAME):
         print "File doesn't exist %s" % (JSON_CONFIG_FILENAME)
         return []
 
     f = open(JSON_CONFIG_FILENAME, 'r')
     contents = f.read()
     f.close()
     decoded = json.loads(contents)
     if 'tests' in decoded:
         tests = decoded['tests']
         for test in tests:
             if 'name' in test and 'url' in test:
                 dockerTest = DockerTest(test['name'], test['url'])
-                if 'prefix' in test:
-                    dockerTest.prefix = test['prefix']
                 if 'llvm_root' in test:
                     dockerTest.llvm_root = test['llvm_root']
                 if 'ignore_checks' in test:
                     dockerTest.ignore_checks = test['ignore_checks']
 
                 dockerTests.append(dockerTest)
     return dockerTests
 
 
 
 def run_test(dockerTest):
-    cmd = 'docker run -i -t %s sh %s %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.prefix, dockerTest.ignore_checks, dockerTest.llvm_root)
+    cmd = 'docker run -i -t %s sh %s %s %s %s %s' % (dockerTest.url, BUILD_SCRIPT, BRANCH, MAKEFLAGS, dockerTest.ignore_checks, dockerTest.llvm_root)
     print cmd
     return os.system(cmd) == 0
 
 
 dockerTests = read_json_config()
 
 
 parser = argparse.ArgumentParser()
 parser.add_argument("-b", "--branch")
 parser.add_argument("docker_names", nargs='*', help="Names of the containers to run. Defaults to running all docker containers.")
 
 args = parser.parse_args()
 
 if args.branch is None:
     BRANCH = 'master'
 else:
     BRANCH = args.branch
 
 results = {}
 success = True
 for test in dockerTests:
     if args.docker_names and test.name not in args.docker_names:
         continue
 
     results[test.name] = run_test(test)
     success = success and results[test.name]
 
 if success:
     print "Success!"
 else:
     for testname in results.keys():
         if not results[testname]:
             print "Test %s failed!" % testname
 
 sys.exit(0 if success else 1)