diff --git a/CH8Build/CH08.35-libtool.sh b/CH8Build/CH08.35-libtool.sh
index 7a6f052..ed39275 100644
--- a/CH8Build/CH08.35-libtool.sh
+++ b/CH8Build/CH08.35-libtool.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libtool-${libtool_version} ] && rm -rf libtool-${libtool_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libtool"
 fi
 
-#echo "running libtool make check"
-#make -k check > ${GLSOURCES}/libtool.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libtool make check"
+  make -k check > ${GLSOURCES}/libtool.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.36-gdbm.sh b/CH8Build/CH08.36-gdbm.sh
index 246877d..54d8891 100644
--- a/CH8Build/CH08.36-gdbm.sh
+++ b/CH8Build/CH08.36-gdbm.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gdbm-${gdbm_version} ] && rm -rf gdbm-${gdbm_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gdbm"
 fi
 
-echo "running gdbm make check"
-make check > ${GLSOURCES}/gdbm.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gdbm make check"
+  make check > ${GLSOURCES}/gdbm.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.37-gperf.sh b/CH8Build/CH08.37-gperf.sh
index b64fa2e..9dc41d6 100644
--- a/CH8Build/CH08.37-gperf.sh
+++ b/CH8Build/CH08.37-gperf.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gperf-${gperf_version} ] && rm -rf gperf-${gperf_version}
 
@@ -20,8 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gperf"
 fi
 
-echo "running gperf make check"
-make -j1 check > ${GLSOURCES}/gperf.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gperf make check"
+  make -j1 check > ${GLSOURCES}/gperf.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.38-expat.sh b/CH8Build/CH08.38-expat.sh
index 4251015..cc038b0 100644
--- a/CH8Build/CH08.38-expat.sh
+++ b/CH8Build/CH08.38-expat.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d expat-${expat_version} ] && rm -rf expat-${expat_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building expat"
 fi
 
-echo "running expat make check"
-make check > ${GLSOURCES}/expat.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running expat make check"
+  make check > ${GLSOURCES}/expat.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.39-inetutils.sh b/CH8Build/CH08.39-inetutils.sh
index ebe4574..6f4edb9 100644
--- a/CH8Build/CH08.39-inetutils.sh
+++ b/CH8Build/CH08.39-inetutils.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d inetutils-${inetutils_version} ] && rm -rf inetutils-${inetutils_version}
 
@@ -30,8 +30,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building inetutils"
 fi
 
-echo "running inetutils make check"
-make check > ${GLSOURCES}/inetutils.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running inetutils make check"
+  make check > ${GLSOURCES}/inetutils.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.40-less.sh b/CH8Build/CH08.40-less.sh
index aa84cc7..7b516c2 100644
--- a/CH8Build/CH08.40-less.sh
+++ b/CH8Build/CH08.40-less.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d less-${less_version} ] && rm -rf less-${less_version}
 
@@ -20,8 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building less"
 fi
 
-echo "running less make check"
-make check > ${GLSOURCES}/less.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running less make check"
+  make check > ${GLSOURCES}/less.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.41-perl.sh b/CH8Build/CH08.41-perl.sh
index 2b8711c..320ad3a 100644
--- a/CH8Build/CH08.41-perl.sh
+++ b/CH8Build/CH08.41-perl.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d perl-${perl_version} ] && rm -rf perl-${perl_version}
 
@@ -43,6 +43,11 @@ if [ $? -ne 0 ]; then
   myfail "Failed building perl"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running perl make test"
+  TEST_JOBS=$(nproc) make test_harness > ${GLSOURCES}/perl.check.log 2>&1
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing perl"
diff --git a/CH8Build/CH08.42-xml-parser.sh b/CH8Build/CH08.42-xml-parser.sh
index a44935a..30ee8ac 100644
--- a/CH8Build/CH08.42-xml-parser.sh
+++ b/CH8Build/CH08.42-xml-parser.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d XML-Parser-${xml_parser_version} ] && rm -rf XML-Parser-${xml_parser_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building XML Parser"
 fi
 
-echo "running XML Parser make test"
-make test > ${GLSOURCES}/XML-Parser.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running XML Parser make test"
+  make test > ${GLSOURCES}/XML-Parser.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.43-Intltool.sh b/CH8Build/CH08.43-Intltool.sh
index 027ebe2..bdb6b93 100644
--- a/CH8Build/CH08.43-Intltool.sh
+++ b/CH8Build/CH08.43-Intltool.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d intltool-${intltool_version} ] && rm -rf intltool-${intltool_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building intltool"
 fi
 
-echo "running intltool make check"
-make check > ${GLSOURCES}/intltool.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running intltool make check"
+  make check > ${GLSOURCES}/intltool.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.44-autoconf.sh b/CH8Build/CH08.44-autoconf.sh
index 07d73b9..3d02d66 100644
--- a/CH8Build/CH08.44-autoconf.sh
+++ b/CH8Build/CH08.44-autoconf.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d autoconf-${autoconf_version} ] && rm -rf autoconf-${autoconf_version}
 
@@ -19,9 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building autoconf"
 fi
 
-# temporarily disable
-#echo "running autoconf make check"
-#make check > ${GLSOURCES}/autoconf.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running autoconf make check"
+  make check > ${GLSOURCES}/autoconf.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.45-automake.sh b/CH8Build/CH08.45-automake.sh
index 482b3f6..6c25475 100644
--- a/CH8Build/CH08.45-automake.sh
+++ b/CH8Build/CH08.45-automake.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d automake-${automake_version} ] && rm -rf automake-${automake_version}
 
@@ -20,9 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building automake"
 fi
 
-# temporarily disable
-#echo "running automake make check"
-#make -j$(($(nproc)>4?$(nproc):4)) check > ${GLSOURCES}/automake.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running automake make check"
+  make -j$(($(nproc)>4?$(nproc):4)) check > ${GLSOURCES}/automake.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.46-libressl.sh b/CH8Build/CH08.46-libressl.sh
index 16d4323..4ca0c75 100644
--- a/CH8Build/CH08.46-libressl.sh
+++ b/CH8Build/CH08.46-libressl.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libressl-${libressl_version} ] && rm -rf libressl-${libressl_version}
 
@@ -41,8 +41,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libressl"
 fi
 
-echo "running libressl make check"
-make check > ${GLSOURCES}/libressl.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libressl make check"
+  make check > ${GLSOURCES}/libressl.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.47-kmod.sh b/CH8Build/CH08.47-kmod.sh
index 1f63ac6..1fce777 100644
--- a/CH8Build/CH08.47-kmod.sh
+++ b/CH8Build/CH08.47-kmod.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d kmod-${kmod_version} ] && rm -rf kmod-${kmod_version}
 
diff --git a/CH8Build/CH08.48-libelf.sh b/CH8Build/CH08.48-libelf.sh
index 6ec11ee..ca38ead 100644
--- a/CH8Build/CH08.48-libelf.sh
+++ b/CH8Build/CH08.48-libelf.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d elfutils-${elfutils_version} ] && rm -rf elfutils-${elfutils_version}
 
@@ -21,8 +21,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libelf"
 fi
 
-echo "running elfutils make check"
-make check > ${GLSOURCES}/elfutils.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running elfutils make check"
+  make check > ${GLSOURCES}/elfutils.check.log 2>&1
+fi
 
 make -C libelf install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.49-libffi.sh b/CH8Build/CH08.49-libffi.sh
index db5bcfe..45d57f6 100644
--- a/CH8Build/CH08.49-libffi.sh
+++ b/CH8Build/CH08.49-libffi.sh
@@ -7,7 +7,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libffi-${libffi_version} ] && rm -rf libffi-${libffi_version}
 
@@ -24,8 +24,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libffi"
 fi
 
-echo "running libffi make check"
-make check > ${GLSOURCES}/libffi.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libffi make check"
+  make check > ${GLSOURCES}/libffi.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.49b-openssl.sh b/CH8Build/CH08.49b-openssl.sh
index 519aa26..e802041 100644
--- a/CH8Build/CH08.49b-openssl.sh
+++ b/CH8Build/CH08.49b-openssl.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d openssl-${openssl_version} ] && rm -rf openssl-${openssl_version}
 
@@ -23,6 +23,11 @@ if [ $? -ne 0 ]; then
   myfail "Failed building openssl"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running openssl make test"
+  HARNESS_JOBS=$(nproc) make test > ${GLSOURCES}/openssl.check.log 2>&1
+fi
+
 sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
 make MANSUFFIX=ssl install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.50-python.sh b/CH8Build/CH08.50-python.sh
index f84fd82..2f08505 100644
--- a/CH8Build/CH08.50-python.sh
+++ b/CH8Build/CH08.50-python.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d Python-${python_version} ] && rm -rf Python-${python_version}
 
@@ -24,8 +24,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building Python"
 fi
 
-echo "running Python make test. Could be time consuming."
-make test TESTOPTS="--timeout 120" > ${GLSOURCES}/python.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running Python make test. Could be time consuming."
+  make test TESTOPTS="--timeout 120" > ${GLSOURCES}/python.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.51-flit-core.sh b/CH8Build/CH08.51-flit-core.sh
index 9539b75..075d9cc 100644
--- a/CH8Build/CH08.51-flit-core.sh
+++ b/CH8Build/CH08.51-flit-core.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d flit_core-${flit_core_version} ] && rm -rf flit_core-${flit_core_version}
 
diff --git a/CH8Build/CH08.52-wheel.sh b/CH8Build/CH08.52-wheel.sh
index 8ad9210..ff34597 100644
--- a/CH8Build/CH08.52-wheel.sh
+++ b/CH8Build/CH08.52-wheel.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d wheel-${wheel_version} ] && rm -rf wheel-${wheel_version}
 
diff --git a/CH8Build/CH08.53-setuptools.sh b/CH8Build/CH08.53-setuptools.sh
index 5540d5d..3bdaa08 100644
--- a/CH8Build/CH08.53-setuptools.sh
+++ b/CH8Build/CH08.53-setuptools.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d setuptools-${setuptools_version} ] && rm -rf setuptools-${setuptools_version}
 
diff --git a/CH8Build/CH08.54-ninja.sh b/CH8Build/CH08.54-ninja.sh
index b953bca..7523c31 100644
--- a/CH8Build/CH08.54-ninja.sh
+++ b/CH8Build/CH08.54-ninja.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d ninja-${ninja_version} ] && rm -rf ninja-${ninja_version}
 
diff --git a/CH8Build/CH08.55-meson.sh b/CH8Build/CH08.55-meson.sh
index 70add89..0fee554 100644
--- a/CH8Build/CH08.55-meson.sh
+++ b/CH8Build/CH08.55-meson.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d meson-${meson_version} ] && rm -rf meson-${meson_version}
 
diff --git a/CH8Build/CH08.56-coreutils.sh b/CH8Build/CH08.56-coreutils.sh
index 70bde2a..8675698 100644
--- a/CH8Build/CH08.56-coreutils.sh
+++ b/CH8Build/CH08.56-coreutils.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d coreutils-${coreutils_version} ] && rm -rf coreutils-${coreutils_version}
 
diff --git a/CH8Build/CH08.57-check.sh b/CH8Build/CH08.57-check.sh
index 9e65288..7afd506 100644
--- a/CH8Build/CH08.57-check.sh
+++ b/CH8Build/CH08.57-check.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d check-${check_version} ] && rm -rf check-${check_version}
 
@@ -20,8 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building check"
 fi
 
-echo "running check make check"
-make check > ${GLSOURCES}/check.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running check make check"
+  make check > ${GLSOURCES}/check.check.log 2>&1
+fi
 
 make docdir=/usr/share/doc/check-${check_version} install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.58-diffutils.sh b/CH8Build/CH08.58-diffutils.sh
index 671d921..cac2766 100644
--- a/CH8Build/CH08.58-diffutils.sh
+++ b/CH8Build/CH08.58-diffutils.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d diffutils-${diffutils_version} ] && rm -rf diffutils-${diffutils_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building diffutils"
 fi
 
-echo "running diffutils make check"
-make check > ${GLSOURCES}/diffutils.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running diffutils make check"
+  make check > ${GLSOURCES}/diffutils.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.59-gawk.sh b/CH8Build/CH08.59-gawk.sh
index d827bd4..63a3947 100644
--- a/CH8Build/CH08.59-gawk.sh
+++ b/CH8Build/CH08.59-gawk.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gawk-${gawk_version} ] && rm -rf gawk-${gawk_version}
 
@@ -21,6 +21,13 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gawk"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gawk make check"
+  chown -R tester .
+  su tester -c "PATH=$PATH make check > gawk.check.log"
+  mv gawk.check.log ${GLSOURCES}/
+fi
+
 rm -f /usr/bin/gawk-${gawk_version}
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.60-findutils.sh b/CH8Build/CH08.60-findutils.sh
index e81f5b3..6ad92db 100644
--- a/CH8Build/CH08.60-findutils.sh
+++ b/CH8Build/CH08.60-findutils.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d findutils-${findutils_version} ] && rm -rf findutils-${findutils_version}
 
@@ -20,6 +20,13 @@ if [ $? -ne 0 ]; then
   myfail "Failed building findutils"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running findutils make check"
+  chown -R tester .
+  su tester -c "PATH=$PATH make check > findutils.check.log"
+  mv findutils.check.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing findutils"
diff --git a/CH8Build/CH08.61-groff.sh b/CH8Build/CH08.61-groff.sh
index d41ab1d..3643a2b 100644
--- a/CH8Build/CH08.61-groff.sh
+++ b/CH8Build/CH08.61-groff.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d groff-${groff_version} ] && rm -rf groff-${groff_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building groff"
 fi
 
-echo "running groff make check"
-make check > ${GLSOURCES}/groff.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running groff make check"
+  make check > ${GLSOURCES}/groff.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.62-grub.sh b/CH8Build/CH08.62-grub.sh
index 30912ae..1edfa3b 100644
--- a/CH8Build/CH08.62-grub.sh
+++ b/CH8Build/CH08.62-grub.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d grub-${grub_version} ] && rm -rf grub-${grub_version}
 
diff --git a/CH8Build/CH08.63-gzip.sh b/CH8Build/CH08.63-gzip.sh
index 03a2844..7c2693a 100644
--- a/CH8Build/CH08.63-gzip.sh
+++ b/CH8Build/CH08.63-gzip.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d gzip-${gzip_version} ] && rm -rf gzip-${gzip_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building gzip"
 fi
 
-echo "running gzip make check"
-make check > ${GLSOURCES}/gzip.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running gzip make check"
+  make check > ${GLSOURCES}/gzip.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.64-iproute2.sh b/CH8Build/CH08.64-iproute2.sh
index 65b3287..50480d9 100644
--- a/CH8Build/CH08.64-iproute2.sh
+++ b/CH8Build/CH08.64-iproute2.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d iproute2-${iproute2_version} ] && rm -rf iproute2-${iproute2_version}
 
diff --git a/CH8Build/CH08.65-kbd.sh b/CH8Build/CH08.65-kbd.sh
index a4bfc01..5a4baa6 100644
--- a/CH8Build/CH08.65-kbd.sh
+++ b/CH8Build/CH08.65-kbd.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d kbd-${kbd_version} ] && rm -rf kbd-${kbd_version}
 
@@ -24,8 +24,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building kbd"
 fi
 
-echo "running kbd make check"
-make check > ${GLSOURCES}/kbd.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running kbd make check"
+  make check > ${GLSOURCES}/kbd.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.66-libpipeline.sh b/CH8Build/CH08.66-libpipeline.sh
index 947ca24..40a2011 100644
--- a/CH8Build/CH08.66-libpipeline.sh
+++ b/CH8Build/CH08.66-libpipeline.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d libpipeline-${libpipeline_version} ] && rm -rf libpipeline-${libpipeline_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building libpipeline"
 fi
 
-echo "running libpipeline make check"
-make check > ${GLSOURCES}/libpipeline.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running libpipeline make check"
+  make check > ${GLSOURCES}/libpipeline.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.67-make.sh b/CH8Build/CH08.67-make.sh
index 5e81fb1..62d91ea 100644
--- a/CH8Build/CH08.67-make.sh
+++ b/CH8Build/CH08.67-make.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d make-${make_version} ] && rm -rf make-${make_version}
 
@@ -19,6 +19,13 @@ if [ $? -ne 0 ]; then
   myfail "Failed building make"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running make make check"
+  chown -R tester .
+  su tester -c "PATH=$PATH make check > make.check.log 2>&1"
+  mv make.check.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing make"
diff --git a/CH8Build/CH08.68-patch.sh b/CH8Build/CH08.68-patch.sh
index e1a1706..21029e9 100644
--- a/CH8Build/CH08.68-patch.sh
+++ b/CH8Build/CH08.68-patch.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d patch-${patch_version} ] && rm -rf patch-${patch_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building patch"
 fi
 
-echo "running patch make check"
-make check > ${GLSOURCES}/patch.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running patch make check"
+  make check > ${GLSOURCES}/patch.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.69-tar.sh b/CH8Build/CH08.69-tar.sh
index 7503b3c..dfc670d 100644
--- a/CH8Build/CH08.69-tar.sh
+++ b/CH8Build/CH08.69-tar.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d tar-${tar_version} ] && rm -rf tar-${tar_version}
 
@@ -20,8 +20,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building tar"
 fi
 
-echo "running tar make check"
-make check > ${GLSOURCES}/tar.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running tar make check"
+  make check > ${GLSOURCES}/tar.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.70-texinfo.sh b/CH8Build/CH08.70-texinfo.sh
index a1a3383..bcd2f78 100644
--- a/CH8Build/CH08.70-texinfo.sh
+++ b/CH8Build/CH08.70-texinfo.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d texinfo-${texinfo_version} ] && rm -rf texinfo-${texinfo_version}
 
@@ -19,8 +19,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building texinfo"
 fi
 
-echo "running texinfo make check"
-make check > ${GLSOURCES}/texinfo.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running texinfo make check"
+  make check > ${GLSOURCES}/texinfo.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.71-vim.sh b/CH8Build/CH08.71-vim.sh
index fdebf1d..61e73c0 100644
--- a/CH8Build/CH08.71-vim.sh
+++ b/CH8Build/CH08.71-vim.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d vim-${vim_version} ] && rm -rf vim-${vim_version}
 
@@ -21,6 +21,14 @@ if [ $? -ne 0 ]; then
   myfail "Failed building vim"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running vim make test"
+  chown -R tester .
+  su tester -c "TERM=xterm-256color LANG=en_US.UTF-8 make -j1 test" \
+    &> vim.test.log
+  mv vim.test.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing vim"
diff --git a/CH8Build/CH08.72-markupsafe.sh b/CH8Build/CH08.72-markupsafe.sh
index 712082b..da68c96 100644
--- a/CH8Build/CH08.72-markupsafe.sh
+++ b/CH8Build/CH08.72-markupsafe.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d MarkupSafe-${markupsafe_version} ] && rm -rf MarkupSafe-${markupsafe_version}
 
diff --git a/CH8Build/CH08.73-jinja2.sh b/CH8Build/CH08.73-jinja2.sh
index 7ac7642..9272d61 100644
--- a/CH8Build/CH08.73-jinja2.sh
+++ b/CH8Build/CH08.73-jinja2.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d jinja2-${jinja2_version} ] && rm -rf jinja2-${jinja2_version}
 
diff --git a/CH8Build/CH08.74-systemd.sh b/CH8Build/CH08.74-systemd.sh
index 38ca992..2c07f6f 100644
--- a/CH8Build/CH08.74-systemd.sh
+++ b/CH8Build/CH08.74-systemd.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d systemd-${systemd_version} ] && rm -rf systemd-${systemd_version}
 
@@ -44,8 +44,10 @@ fi
 
 echo 'NAME="Linux From Scratch"' > /etc/os-release
 
-echo "running systemd ninja test"
-ninja test > ${GLSOURCES}/systemd.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running systemd ninja test"
+  ninja test > ${GLSOURCES}/systemd.check.log 2>&1
+fi
 
 ninja install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.75-dbus.sh b/CH8Build/CH08.75-dbus.sh
index 47cd42a..9903f76 100644
--- a/CH8Build/CH08.75-dbus.sh
+++ b/CH8Build/CH08.75-dbus.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d dbus-${dbus_version} ] && rm -rf dbus-${dbus_version}
 
@@ -28,8 +28,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building dbus"
 fi
 
-echo "running dbus make check"
-make check > ${GLSOURCES}/dbus.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running dbus make check"
+  make check > ${GLSOURCES}/dbus.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.76-mandb.sh b/CH8Build/CH08.76-mandb.sh
index 7157bd0..facbfe7 100644
--- a/CH8Build/CH08.76-mandb.sh
+++ b/CH8Build/CH08.76-mandb.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d man-db-${mandb_version} ] && rm -rf man-db-${mandb_version}
 
@@ -26,8 +26,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building man-db"
 fi
 
-echo "running man-db make check"
-make check > ${GLSOURCES}/man-db.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running man-db make check"
+  make check > ${GLSOURCES}/man-db.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then
diff --git a/CH8Build/CH08.77-procps-ng.sh b/CH8Build/CH08.77-procps-ng.sh
index a1e6b54..e06e205 100644
--- a/CH8Build/CH08.77-procps-ng.sh
+++ b/CH8Build/CH08.77-procps-ng.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d procps-ng-${procps_version} ] && rm -rf procps-ng-${procps_version}
 
@@ -23,6 +23,13 @@ if [ $? -ne 0 ]; then
   myfail "Failed building procps-ng"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running procps-ng make check"
+  chown -R tester .
+  su tester -c "PATH=$PATH make check > procps-ng.check.log"
+  mv procps-ng.check.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing procps-ng"
diff --git a/CH8Build/CH08.78-util-linux.sh b/CH8Build/CH08.78-util-linux.sh
index 0156755..b820031 100644
--- a/CH8Build/CH08.78-util-linux.sh
+++ b/CH8Build/CH08.78-util-linux.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d util-linux-${util_linux_version} ] && rm -rf util-linux-${util_linux_version}
 
@@ -34,6 +34,14 @@ if [ $? -ne 0 ]; then
   myfail "Failed building util-linux"
 fi
 
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running util-linux make check"
+  touch /etc/fstab
+  chown -R tester .
+  su tester -c "make -k check > util-linux.check.log"
+  mv util-linux.check.log ${GLSOURCES}/
+fi
+
 make install
 if [ $? -ne 0 ]; then
   myfail "Failed installing util-linux"
diff --git a/CH8Build/CH08.79-e2fsprogs.sh b/CH8Build/CH08.79-e2fsprogs.sh
index 7f92086..adf9678 100644
--- a/CH8Build/CH08.79-e2fsprogs.sh
+++ b/CH8Build/CH08.79-e2fsprogs.sh
@@ -4,7 +4,7 @@ source versions.sh
 
 GLSOURCES="/sources"
 
-pushd $GLSOURCES > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
+pushd ${GLSOURCES} > /dev/null 2>&1 || myfail "Failed to move to ${GLSOURCES}"
 
 [ -d e2fsprogs-${e2fsprogs_version} ] && rm -rf e2fsprogs-${e2fsprogs_version}
 
@@ -27,8 +27,10 @@ if [ $? -ne 0 ]; then
   myfail "Failed building e2fsprogs"
 fi
 
-echo "running e2fsprogs make check"
-make check > ${GLSOURCES}/e2fsprogs.check 2>&1
+if [ ! -f ${GLSOURCES}/SKIPTESTS ]; then
+  echo "running e2fsprogs make check"
+  make check > ${GLSOURCES}/e2fsprogs.check.log 2>&1
+fi
 
 make install
 if [ $? -ne 0 ]; then