diff --git a/buildout.cfg b/buildout.cfg
index 8ca29cf..eecc79b 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -1,2 +1,2 @@
 [buildout]
-extends = test-4.3.x.cfg
+extends = test-5.x.cfg
diff --git a/buildout.cfg.in b/buildout.cfg.in
deleted file mode 100644
index a5befa9..0000000
--- a/buildout.cfg.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[buildout]
-extends =
-    develop.cfg
diff --git a/develop.cfg b/develop.cfg
index 9d38119..f3b1043 100644
--- a/develop.cfg
+++ b/develop.cfg
@@ -1,5 +1,6 @@
 [buildout]
 extends =
+    base.cfg
     buildout.cfg
     versions.cfg
 
diff --git a/plone/app/tiles/tests.py b/plone/app/tiles/tests.py
index 33b8a75..1a29923 100644
--- a/plone/app/tiles/tests.py
+++ b/plone/app/tiles/tests.py
@@ -25,9 +25,13 @@
     from plone.app.drafts.interfaces import PATH_KEY
     from plone.app.drafts.interfaces import TARGET_KEY
 
-import re
-import unittest2 as unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 import urllib
+import re
 
 
 class FunctionalTest(unittest.TestCase):
diff --git a/test-4.2.x.cfg b/test-4.2.x.cfg
index ca0e9d4..7a2a5c8 100644
--- a/test-4.2.x.cfg
+++ b/test-4.2.x.cfg
@@ -2,22 +2,7 @@
 extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-4.2.x.cfg
     https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
-package-name = plone.app.tiles
-package-extras = [test]
-parts += extra
-test-eggs += Pillow
-
-[extra]
-recipe = zc.recipe.egg
-eggs =
-    createcoverage
-    coveralls
-
-[code-analysis]
-directory = ${buildout:directory}/plone/app/tiles
-pre-commit-hook = False
-flake8-ignore = E501
+    base.cfg
 
 [versions]
-coverage = 3.7
 plone.app.blocks = 1.1
diff --git a/test-4.3.x.cfg b/test-4.3.x.cfg
index 3d55ae5..d34abaf 100644
--- a/test-4.3.x.cfg
+++ b/test-4.3.x.cfg
@@ -2,23 +2,6 @@
 extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
     https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
-package-name = plone.app.tiles
-package-extras = [test]
-parts += extra
+    base.cfg
 test-eggs += Pillow
 
-[extra]
-recipe = zc.recipe.egg
-eggs =
-    createcoverage
-    coveralls
-
-[code-analysis]
-directory = ${buildout:directory}/plone/app/tiles
-pre-commit-hook = False
-flake8-ignore = E501
-
-[versions]
-coverage = 3.7
-
-setuptools =
diff --git a/test-5.x.cfg b/test-5.x.cfg
index 6041067..d58ed47 100644
--- a/test-5.x.cfg
+++ b/test-5.x.cfg
@@ -2,22 +2,4 @@
 extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-5.x.cfg
     https://raw.github.com/collective/buildout.plonetest/master/qa.cfg
-package-name = plone.app.tiles
-package-extras = [test]
-parts += extra
-test-eggs += Pillow
-
-[extra]
-recipe = zc.recipe.egg
-eggs =
-    createcoverage
-    coveralls
-
-[code-analysis]
-directory = ${buildout:directory}/plone/app/tiles
-pre-commit-hook = False
-flake8-ignore = E501
-
-[versions]
-coverage = 3.7
-zc.buildout = 1.7.1
+    base.cfg