diff --git a/component/openssl/buildout.cfg b/component/openssl/buildout.cfg
index 5ec990bff1e033649b1f941fab7a1550dcc65881..edd3f6a05f6c50ac0c88c95264c749550770f130 100644
--- a/component/openssl/buildout.cfg
+++ b/component/openssl/buildout.cfg
@@ -8,7 +8,7 @@ extends =
   ../ca-certificates/buildout.cfg
   ../coreutils/buildout.cfg
   ../patch/buildout.cfg
-  ../perl/buildout.cfg
+  ../perl-Text-Template/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -37,13 +37,14 @@ configure-options =
 make-options =
   SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
 make-targets =
-  install_sw install_ssldirs &&
+  test install_sw install_ssldirs &&
   rm -f ${:certs}/* &&
   for i in ${ca-certificates:location}/certs/*/*.crt; do
     ln -sv $i ${:certs}/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
   ; done
 environment =
-  PERL=${perl:location}/bin/perl
+  PERL=${perl-Text-Template:perl-bin}
+
 
 [openssl-output]
 # Shared binary location to ease migration
@@ -80,9 +81,9 @@ configure-options =
 make-options =
   SHARED_LDFLAGS='-Wl,-rpath=${:location}/lib -Wl,-rpath=${zlib:location}/lib'
 make-targets =
-  install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* &&
+  test install_sw && x=${:location}/etc/ssl/certs && rm -f $x/* &&
   for i in ${ca-certificates:location}/certs/*/*.crt; do
     ln -sfv $i $x/`${:location}/bin/openssl x509 -hash -noout -in $i`.0
   ; done
 environment =
-  PERL=${perl:location}/bin/perl
+  PERL=${perl-Text-Template:perl-bin}
diff --git a/component/perl-Text-Template/buildout.cfg b/component/perl-Text-Template/buildout.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..074cb3946a6dab19a81970a96f42f447b3fee468
--- /dev/null
+++ b/component/perl-Text-Template/buildout.cfg
@@ -0,0 +1,11 @@
+[buildout]
+extends =
+  ../perl/buildout.cfg
+parts =
+  perl-Text-Template
+
+[perl-Text-Template]
+<= perl-CPAN-package
+module =Text/Text-Template
+version = 1.53
+md5sum = 904981e0ff233c4ab6099f4d889729c8
diff --git a/component/python-2.7/buildout.cfg b/component/python-2.7/buildout.cfg
index d537780ddf424a6a83d11264dc2ddcd8246a9fe7..106e5c88d643582490b315a7ec3b5fa296bd6196 100644
--- a/component/python-2.7/buildout.cfg
+++ b/component/python-2.7/buildout.cfg
@@ -53,14 +53,16 @@ configure-options =
   --with-system-expat
   --with-system-ffi
   --with-threads
-# Profiled build:
+# Enable profile guided optimization ( https://github.com/python/cpython/blob/2.7/README#L194 )
+# this will run part of the test suite, but ignore failures. We don't want to ignore failure and we
+# want to run the full test suite, so we make `test` target. As a result of this we run test suite twice.
 make-binary =
-make-targets = make profile-opt && make install
+make-targets = make profile-opt && make test install
 
 extra-ldflags =
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes
 environment =
   PATH=${patch:location}/bin:${xz-utils:location}/bin:%(PATH)s
-  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
-  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib ${:extra-ldflags}
+  CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include  -I${gdbm:location}/include -I${openssl-1.0:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
+  LDFLAGS=-L${zlib:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl-1.0:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl-1.0:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib ${:extra-ldflags}
diff --git a/component/python3/buildout.cfg b/component/python3/buildout.cfg
index f78694fd42b1b6836158dda80171750b21134267..91ffc984e08ad5c042ccd5df93e715fd86111d91 100644
--- a/component/python3/buildout.cfg
+++ b/component/python3/buildout.cfg
@@ -37,9 +37,10 @@ configure-options =
   --with-system-expat
   --with-system-ffi
   --with-threads
-# Profiled build:
+# Profiled build: https://github.com/python/cpython#profile-guided-optimization
   --enable-optimizations
 pre-install = mkdir profile-opt
+make-targets = test install
 
 # the entry "-Wl,-rpath=${file:location}/lib" below is needed by python-magic,
 # which would otherwise load the system libmagic.so with ctypes