diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb
index 057c889c190..aa1648fa036 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-foss-2016b-Python-2.7.12.eb
@@ -1,23 +1,35 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.4'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'foss', 'version': '2016b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059']
-
 dependencies = [('Python', '2.7.12')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+# pip 8.1.2 (included with Python 2.7.12) doesn't support 'pip check' yet
+sanity_pip_check = False
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
index 4817748dbce..92bfc1f2e0b 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.4-intel-2016b-Python-2.7.12.eb
@@ -1,22 +1,35 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.4'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'intel', 'version': '2016b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-
 dependencies = [('Python', '2.7.12')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+# pip 8.1.2 (included with Python 2.7.12) doesn't support 'pip check' yet
+sanity_pip_check = False
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.6-foss-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.6-foss-2017a-Python-2.7.13.eb
index 0f724f7b475..998e83cb614 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.6-foss-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.6-foss-2017a-Python-2.7.13.eb
@@ -1,25 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.6'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'foss', 'version': '2017a'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = [
-    '48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d',  # Mako-1.0.6.tar.gz
-]
-
 dependencies = [('Python', '2.7.13')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.6-intel-2017a-Python-2.7.13.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.6-intel-2017a-Python-2.7.13.eb
index 9bae4651685..6d556cd86fa 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.6-intel-2017a-Python-2.7.13.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.6-intel-2017a-Python-2.7.13.eb
@@ -1,22 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.6'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'intel', 'version': '2017a'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-
 dependencies = [('Python', '2.7.13')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['48559ebd872a8e77f92005884b3d88ffae552812cdf17db6768e5c3be5ebbe0d'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-foss-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-foss-2017b-Python-2.7.14.eb
index 38e5f06bc8b..16ec8b1aa98 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-foss-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-foss-2017b-Python-2.7.14.eb
@@ -1,23 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.7'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'foss', 'version': '2017b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae']
-
 dependencies = [('Python', '2.7.14')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-fosscuda-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-fosscuda-2017b-Python-2.7.14.eb
index 323b63bda50..092a64f05b2 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-fosscuda-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-fosscuda-2017b-Python-2.7.14.eb
@@ -1,26 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.7'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'fosscuda', 'version': '2017b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae']
-
 dependencies = [('Python', '2.7.14')]
 
 use_pip = True
-download_dep_fail = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae'],
+    }),
+]
 
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg-info'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intel-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intel-2017b-Python-2.7.14.eb
index ba493f56eb5..2208f39b88d 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intel-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intel-2017b-Python-2.7.14.eb
@@ -1,23 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.7'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'intel', 'version': '2017b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae']
-
 dependencies = [('Python', '2.7.14')]
 
+use_pip = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae'],
+    }),
+]
+
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intelcuda-2017b-Python-2.7.14.eb b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intelcuda-2017b-Python-2.7.14.eb
index 918a6d7e6bf..2fd2e1001b0 100644
--- a/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intelcuda-2017b-Python-2.7.14.eb
+++ b/easybuild/easyconfigs/m/Mako/Mako-1.0.7-intelcuda-2017b-Python-2.7.14.eb
@@ -1,26 +1,34 @@
-easyblock = 'PythonPackage'
+easyblock = 'PythonBundle'
 
 name = 'Mako'
 version = '1.0.7'
 versionsuffix = '-Python-%(pyver)s'
 
-homepage = 'http://www.makotemplates.org'
+homepage = 'https://www.makotemplates.org'
 description = """A super-fast templating language that borrows the best ideas from the existing templating languages"""
 
 toolchain = {'name': 'intelcuda', 'version': '2017b'}
 
-source_urls = [PYPI_SOURCE]
-sources = [SOURCE_TAR_GZ]
-checksums = ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae']
-
 dependencies = [('Python', '2.7.14')]
 
 use_pip = True
-download_dep_fail = True
+
+exts_default_options = {'source_urls': [PYPI_SOURCE]}
+
+exts_list = [
+    ('MarkupSafe', '1.1.1', {
+        'checksums': ['29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b'],
+    }),
+    (name, version, {
+        'checksums': ['4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae'],
+    }),
+]
 
 sanity_check_paths = {
     'files': ['bin/mako-render'],
-    'dirs': ['lib/python%(pyshortver)s/site-packages/%(name)s-%(version)s-py%(pyshortver)s.egg-info'],
+    'dirs': ['lib/python%(pyshortver)s/site-packages/'],
 }
 
+sanity_pip_check = True
+
 moduleclass = 'devel'
diff --git a/test/easyconfigs/easyconfigs.py b/test/easyconfigs/easyconfigs.py
index 5efed20d6a8..c5fea851575 100644
--- a/test/easyconfigs/easyconfigs.py
+++ b/test/easyconfigs/easyconfigs.py
@@ -552,6 +552,8 @@ def check_python_packages(self, changed_ecs, added_ecs_filenames):
         # These packages do not support installation with 'pip'
         whitelist_pip = [r'MATLAB-Engine-.*', r'PyTorch-.*', r'Meld-.*']
 
+        whitelist_pip_check = [r'Mako-1.0.4.*Python-2.7.12.*']
+
         failing_checks = []
 
         for ec in changed_ecs:
@@ -609,7 +611,8 @@ def check_python_packages(self, changed_ecs, added_ecs_filenames):
             if use_pip and easyblock in ['PythonBundle', 'PythonPackage']:
                 sanity_pip_check = ec.get('sanity_pip_check') or exts_default_options.get('sanity_pip_check')
                 if not sanity_pip_check and not any(re.match(regex, ec_fn) for regex in whitelist_pip):
-                    failing_checks.append("sanity_pip_check is enabled in %s" % ec_fn)
+                    if not any(re.match(regex, ec_fn) for regex in whitelist_pip_check):
+                        failing_checks.append("sanity_pip_check is enabled in %s" % ec_fn)
 
         self.assertFalse(failing_checks, '\n'.join(failing_checks))