diff --git a/tests/test_build.py b/tests/test_build.py
index 6d86c8b7cb..f4d917e9ba 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -38,8 +38,8 @@ class BuildTest(base.BaseTestCase):
             bad_results, good_results, unmatched_results = build.main()
 
         # these are images that are known to not build properly
-        excluded_images = ["gnocchi-api",
-                           "gnocchi-statsd"]
+        excluded_images = ["gnocchi-base",
+                           "murano-base"]
 
         failures = 0
         for image, result in bad_results.iteritems():
diff --git a/tox.ini b/tox.ini
index b06657b266..284fa0bc74 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,6 @@ commands =
     {toxinidir}/tools/validate-all-json.sh
     {toxinidir}/tools/validate-all-yaml.sh
     {toxinidir}/tools/validate-all-maintainer.sh
-    {toxinidir}/tools/validate-links.sh
 
 [testenv:bashate]
 deps = bashate
@@ -50,7 +49,7 @@ whitelist_externals = find
 commands =
    find . -type f -name "*.pyc" -delete
    bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosBinaryDocker
+   sudo -g docker testr run test_build.BuildTestCentosBinaryTemplate
 
 # deprecated
 [testenv:images-centos-source]
@@ -60,7 +59,7 @@ whitelist_externals = find
 commands =
    find . -type f -name "*.pyc" -delete
    bash -c "if [ ! -d .testrepository ]; then testr init; fi"
-   sudo -g docker testr run test_build.BuildTestCentosSourceDocker
+   sudo -g docker testr run test_build.BuildTestCentosSourceTemplate
 
 [testenv:images-ubuntu-source]
 whitelist_externals = find