diff --git a/README.md b/README.md
index 3176f61..94a4109 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@ edit **vars.sh** and change the following options to suit the desired needs:
 - LOCALE: the system locale which will be set
 - TELNETD: if the telnet server service is desired to be installed;
   if not, set this option to anything but TRUE
+- MAKECHECK: if in addition to the build and install of all packages the checks
+  should be run too, set this to TRUE
 
 proceed with the LFS chapters:
 
diff --git a/chap8p1.sh b/chap8p1.sh
index d72fbfd..cdc3d7a 100644
--- a/chap8p1.sh
+++ b/chap8p1.sh
@@ -51,7 +51,9 @@ echo "rootsbindir=/usr/sbin" > configparms &&
              --with-headers=/usr/include              \
              libc_cv_slibdir=/usr/lib                 &&
 make &&
-make check | tee ../../check-log_"$LFS_GLIBC".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../../check-log_"$LFS_GLIBC".log;
+fi
 touch /etc/ld.so.conf &&
 sed '/test-installation/s@$(LFS_PERL)@echo not running@' -i ../Makefile &&
 make install &&
@@ -121,7 +123,9 @@ tar xf "$LFS_ZLIB".tar.xz &&
 cd "$LFS_ZLIB" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_ZLIB".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_ZLIB".log;
+fi
 make install &&
 rm -fv /usr/lib/libz.a &&
 cd .. &&
@@ -170,7 +174,9 @@ cd "$LFS_XZ" &&
             --disable-static \
             --docdir=/usr/share/doc/xz-5.4.1 &&
 make &&
-make check | tee ../check-log_"$LFS_XZ".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_XZ".log;
+fi
 make install &&
 cd .. &&
 rm -rf "LFS_XZ" &&
@@ -187,7 +193,9 @@ echo "Starting 8.9 ""$LFS_ZSTD""" >> build.log
 tar xf "$LFS_ZSTD".tar.gz &&
 cd "$LFS_ZSTD" &&
 make prefix=/usr &&
-make check | tee ../check-log_"$LFS_ZSTD".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_ZSTD".log;
+fi
 make prefix=/usr install &&
 rm -v /usr/lib/libzstd.a &&
 cd .. &&
@@ -206,7 +214,9 @@ tar xf "$LFS_FILE".tar.gz &&
 cd "$LFS_FILE" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_FILE".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_FILE".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_FILE" &&
@@ -248,7 +258,9 @@ tar xf "$LFS_M4".tar.xz &&
 cd "$LFS_M4" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_M4".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_M4".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_M4" &&
@@ -266,7 +278,9 @@ tar xf "$LFS_BC".tar.xz &&
 cd "$LFS_BC" &&
 CC=gcc ./configure --prefix=/usr -G -O3 -r &&
 make &&
-make test | tee ../check-log_"$LFS_BC".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../check-log_"$LFS_BC".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_BC" &&
@@ -286,7 +300,9 @@ cd "$LFS_FLEX" &&
             --docdir=/usr/share/doc/flex-2.6.4 \
             --disable-static &&
 make &&
-make check | tee ../check-log_"$LFS_FLEX".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_FLEX".log;
+fi
 make install &&
 ln -sv flex /usr/bin/lex &&
 cd .. &&
@@ -321,7 +337,9 @@ sed -e "s|$SRCDIR/unix/pkgs/itcl4.2.3|/usr/lib/itcl4.2.3|" \
     -e "s|$SRCDIR/pkgs/itcl4.2.3|/usr/include|"            \
     -i pkgs/itcl4.2.3/itclConfig.sh                        &&
 unset SRCDIR &&
-make test | tee ../../check-log_"$LFS_TCL".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../../check-log_"$LFS_TCL".log;
+fi
 make install &&
 chmod -v u+w /usr/lib/libtcl8.6.so &&
 make install-private-headers &&
@@ -350,8 +368,10 @@ cd "$LFS_EXPECT" &&
             --enable-shared         \
             --mandir=/usr/share/man \
             --with-tclinclude=/usr/include &&
-make &&            
-make test | tee ../check-log_"$LFS_EXPECT".log;
+make &&
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../check-log_"$LFS_EXPECT".log;
+fi
 make install &&
 ln -svf expect5.45.4/libexpect5.45.4.so /usr/lib &&
 cd .. && rm -rf "$LFS_EXPECT" &&
@@ -375,7 +395,9 @@ makeinfo --plaintext       -o doc/dejagnu.txt  ../doc/dejagnu.texi &&
 make install &&
 install -v -dm755  /usr/share/doc/dejagnu-1.6.3 &&
 install -v -m644   doc/dejagnu.{html,txt} /usr/share/doc/dejagnu-1.6.3 &&
-make check | tee ../../check-log_"$LFS_DEJAGNU".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../../check-log_"$LFS_DEJAGNU".log;
+fi
 cd ../.. &&
 rm -rf "$LFS_DEJAGNU" &&
 
@@ -406,8 +428,10 @@ cd       build &&
              --enable-64-bit-bfd \
              --with-system-zlib  &&
 make tooldir=/usr &&
-make -k check | tee ../../check-log_"$LFS_BINUTILS".log;
-grep '^FAIL:' $(find -name '*.log') &&
+if [ "$MAKECHECK" = TRUE ]; then
+    make -k check | tee ../../check-log_"$LFS_BINUTILS".log;
+    grep '^FAIL:' $(find -name '*.log')
+fi
 make tooldir=/usr install &&
 rm -fv /usr/lib/lib{bfd,ctf,ctf-nobfd,sframe,opcodes}.a &&
 rm -fv /usr/share/man/man1/{gprofng,gp-*}.1 &&
@@ -431,9 +455,11 @@ cd "$LFS_GMP" &&
             --docdir=/usr/share/doc/gmp-6.2.1 &&
 make &&
 make html &&
-make check 2>&1 | tee gmp-check-log;
-awk '/# PASS:/{total+=$3} ; END{print total}' gmp-check-log &&
-cp gmp-check-log ../check-log_"$LFS_GMP".log &&
+if [ "$MAKECHECK" = TRUE ]; then
+    make check 2>&1 | tee gmp-check-log;
+    awk '/# PASS:/{total+=$3} ; END{print total}' gmp-check-log &&
+    cp gmp-check-log ../check-log_"$LFS_GMP".log
+fi
 make install &&
 make install-html &&
 cd .. &&
@@ -459,7 +485,9 @@ sed -e 's/+01,234,567/+1,234,567 /' \
             --docdir=/usr/share/doc/mpfr-4.2.0 &&
 make &&
 make html &&
-make check | tee ../check-log_"$LFS_MPFR".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_MPFR".log;
+fi
 make install &&
 make install-html &&
 cd .. &&
@@ -481,7 +509,9 @@ cd "$LFS_MPC" &&
             --docdir=/usr/share/doc/mpc-1.3.1 &&
 make &&
 make html &&
-make check | tee ../check-log_"$LFS_MPC".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_MPC".log;
+fi
 make install &&
 make install-html &&
 cd .. &&
@@ -503,7 +533,9 @@ cd "$LFS_ATTR" &&
             --sysconfdir=/etc \
             --docdir=/usr/share/doc/attr-2.5.1 &&
 make &&
-make check | tee ../check-log_"$LFS_ATTR".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_ATTR".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_ATTR" &&
@@ -540,7 +572,9 @@ tar xf "$LFS_LIBCAP".tar.xz &&
 cd "$LFS_LIBCAP" &&
 sed -i '/install -m.*STA/d' libcap/Makefile &&
 make prefix=/usr lib=lib &&
-make test | tee ../check-log_"$LFS_LIBCAP".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../check-log_"$LFS_LIBCAP".log;
+fi
 make prefix=/usr lib=lib install &&
 cd .. &&
 rm -rf "$LFS_LIBCAP" &&
@@ -612,10 +646,12 @@ cd       build &&
              --with-system-zlib       &&
 make &&
 ulimit -s 32768 &&
-chown -Rv tester . &&
-su tester -c "PATH=$PATH make -k -j""$JOBS"" check";
-../contrib/test_summary | tee ../../check-log_"$LFS_GCC".log &&
-../contrib/test_summary | grep -A7 Summ &&
+if [ "$MAKECHECK" = TRUE ]; then
+    chown -Rv tester . &&
+    su tester -c "PATH=$PATH make -k -j""$JOBS"" check";
+    ../contrib/test_summary | tee ../../check-log_"$LFS_GCC".log &&
+    ../contrib/test_summary | grep -A7 Summ
+fi
 make install &&
 chown -v -R root:root \
     /usr/lib/gcc/$(gcc -dumpmachine)/12.2.0/include{,-fixed} &&
@@ -684,7 +720,9 @@ cd "$LFS_PKGCONFIG" &&
             --disable-host-tool        \
             --docdir=/usr/share/doc/pkg-config-0.29.2 &&
 make &&
-make check | tee ../check-log_"$LFS_PKGCONFIG".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_PKGCONFIG".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_PKGCONFIG" &&
@@ -741,8 +779,10 @@ cd "$LFS_SED" &&
 ./configure --prefix=/usr &&
 make &&
 make html &&
-chown -Rv tester . &&
-su tester -c "PATH=$PATH make check" | tee ../check-log_"$LFS_GCC".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    chown -Rv tester . &&
+    su tester -c "PATH=$PATH make check" | tee ../check-log_"$LFS_GCC".log;
+fi
 make install &&
 install -d -m755           /usr/share/doc/sed-4.9 &&
 install -m644 doc/sed.html /usr/share/doc/sed-4.9 &&
@@ -781,7 +821,9 @@ cd "$LFS_GETTEXT" &&
             --disable-static \
             --docdir=/usr/share/doc/gettext-0.21.1 &&
 make &&
-make check | tee ../check-log_"$LFS_GCC".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_GCC".log;
+fi
 make install &&
 chmod -v 0755 /usr/lib/preloadable_libintl.so &&
 cd .. &&
@@ -800,7 +842,9 @@ tar xf "$LFS_BISON".tar.xz &&
 cd "$LFS_BISON" &&
 ./configure --prefix=/usr --docdir=/usr/share/doc/bison-3.8.2 &&
 make &&
-make check | tee ../check-log_"$LFS_BISON".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_BISON".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_BISON" &&
@@ -819,7 +863,9 @@ cd "$LFS_GREP" &&
 sed -i "s/echo/#echo/" src/egrep.sh &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_GREP".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_GREP".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_GREP" &&
@@ -840,7 +886,8 @@ cd "$LFS_BASH" &&
             --with-installed-readline \
             --docdir=/usr/share/doc/bash-5.2.15 &&
 make &&
-chown -Rv tester . &&
+if [ "$MAKECHECK" = TRUE ]; then
+    chown -Rv tester . &&
 su -s /usr/bin/expect tester << EOF | tee ../check-log_"$LFS_BASH".log;
 set timeout -1
 spawn make tests
@@ -848,6 +895,7 @@ expect eof
 lassign [wait] _ _ _ value
 exit $value
 EOF
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_BASH" &&
diff --git a/chap8p2.sh b/chap8p2.sh
index 3db3406..984375d 100644
--- a/chap8p2.sh
+++ b/chap8p2.sh
@@ -10,7 +10,9 @@ tar xf "$LFS_LIBTOOL".tar.xz &&
 cd "$LFS_LIBTOOL" &&
 ./configure --prefix=/usr &&
 make &&
-TESTSUITEFLAGS=-j"$JOBS" make -k check | tee ../check-log_"$LFS_LIBTOOL".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    TESTSUITEFLAGS=-j"$JOBS" make -k check | tee ../check-log_"$LFS_LIBTOOL".log;
+fi
 make install &&
 rm -fv /usr/lib/libltdl.a &&
 cd .. &&
@@ -31,7 +33,9 @@ cd "$LFS_GDBM" &&
             --disable-static \
             --enable-libgdbm-compat &&
 make &&
-make check | tee ../check-log_"$LFS_GDBM".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_GDBM".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_GDBM" &&
@@ -49,7 +53,9 @@ tar xf "$LFS_GPERF".tar.gz &&
 cd "$LFS_GPERF" &&
 ./configure --prefix=/usr --docdir=/usr/share/doc/gperf-3.1 &&
 make &&
-make -j1 check | tee ../check-log_"$LFS_GPERF".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make -j1 check | tee ../check-log_"$LFS_GPERF".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_GPERF" &&
@@ -69,7 +75,9 @@ cd "$LFS_EXPAT" &&
             --disable-static \
             --docdir=/usr/share/doc/expat-2.5.0 &&
 make &&
-make check | tee ../check-log_"$LFS_EXPAT".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_EXPAT".log;
+fi
 make install &&
 install -v -m644 doc/*.{html,css} /usr/share/doc/expat-2.5.0 &&
 cd .. &&
@@ -111,7 +119,9 @@ else
                 --disable-servers
 fi &&
 make &&
-make check | tee ../check-log_"$LFS_INETUTILS".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_INETUTILS".log;
+fi
 make install &&
 mv -v /usr/{,s}bin/ifconfig &&
 if [ "$TELNETD" = TRUE ]; then
@@ -183,8 +193,10 @@ sh Configure -des                                         \
              -Dpager="/usr/bin/less -isR"                 \
              -Duseshrplib                                 \
              -Dusethreads                                 &&
-make &&    
-make test | tee ../check-log_"$LFS_PERL".log;
+make &&
+if [ "$MAKECHECK" = TRUE ]; then  
+    make test | tee ../check-log_"$LFS_PERL".log;
+fi
 make install &&
 unset BUILD_ZLIB BUILD_BZIP2
 cd .. &&
@@ -203,7 +215,9 @@ tar xf "$LFS_XMLPARSER".tar.gz &&
 cd "$LFS_XMLPARSER" &&
 perl Makefile.PL &&
 make &&
-make test | tee ../check-log_"$LFS_XMLPARSER".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../check-log_"$LFS_XMLPARSER".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_XMLPARSER" &&
@@ -222,7 +236,9 @@ cd "$LFS_INTLTOOL" &&
 sed -i 's:\\\${:\\\$\\{:' intltool-update.in &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_INTLTOOL".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_INTLTOOL".log;
+fi
 make install &&
 install -v -Dm644 doc/I18N-HOWTO /usr/share/doc/intltool-0.51.0/I18N-HOWTO &&
 cd .. &&
@@ -244,7 +260,9 @@ sed -e 's/SECONDS|/&SHLVL|/'               \
     -i.orig tests/local.at                 &&
 ./configure --prefix=/usr &&
 make &&
-TESTSUITEFLAGS=-j"$JOBS" make check | tee ../check-log_"$LFS_AUTOCONF".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    TESTSUITEFLAGS=-j"$JOBS" make check | tee ../check-log_"$LFS_AUTOCONF".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_AUTOCONF" &&
@@ -262,7 +280,9 @@ tar xf "$LFS_AUTOMAKE".tar.xz &&
 cd "$LFS_AUTOMAKE" &&
 ./configure --prefix=/usr --docdir=/usr/share/doc/automake-1.16.5 &&
 make &&
-make -j4 check | tee ../check-log_"$LFS_AUTOMAKE".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make -j4 check | tee ../check-log_"$LFS_AUTOMAKE".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_AUTOMAKE" &&
@@ -284,7 +304,9 @@ cd "$LFS_OPENSSL" &&
          shared                \
          zlib-dynamic          &&
 make &&
-make test | tee ../check-log_"$LFS_OPENSSL".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make test | tee ../check-log_"$LFS_OPENSSL".log;
+fi
 sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile &&
 make MANSUFFIX=ssl install &&
 mv -v /usr/share/doc/openssl /usr/share/doc/openssl-3.0.8 &&
@@ -333,7 +355,9 @@ cd "$LFS_ELFUTILS" &&
             --disable-debuginfod         \
             --enable-libdebuginfod=dummy &&
 make &&
-make check | tee ../check-log_"$LFS_ELFUTILS".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_ELFUTILS".log;
+fi
 make -C libelf install &&
 install -vm644 config/libelf.pc /usr/lib/pkgconfig &&
 rm /usr/lib/libelf.a &&
@@ -355,7 +379,9 @@ cd "$LFS_LIBFFI" &&
             --disable-static       \
             --with-gcc-arch=native &&
 make &&
-make check | tee ../check-log_"$LFS_LIBFFI".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_LIBFFI".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_LIBFFI" &&
@@ -426,8 +452,10 @@ sed -i '/int Guess/a \
   if ( j > 0 ) return j;\
 ' src/ninja.cc &&
 python3 configure.py --bootstrap &&
-./ninja ninja_test | tee ../check-log_"$LFS_NINJA".log;
-./ninja_test --gtest_filter=-SubprocessTest.SetWithLots | tee -a ../check-log_"$LFS_NINJA".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    ./ninja ninja_test | tee ../check-log_"$LFS_NINJA".log;
+    ./ninja_test --gtest_filter=-SubprocessTest.SetWithLots | tee -a ../check-log_"$LFS_NINJA".log;
+fi
 install -vm755 ninja /usr/bin/ &&
 install -vDm644 misc/bash-completion /usr/share/bash-completion/completions/ninja &&
 install -vDm644 misc/zsh-completion  /usr/share/zsh/site-functions/_ninja &&
@@ -469,11 +497,13 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
             --prefix=/usr            \
             --enable-no-install-program=kill,uptime &&
 make &&
-make NON_ROOT_USERNAME=tester check-root &&
-echo "dummy:x:102:tester" >> /etc/group &&
-chown -Rv tester . &&
-su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check" | tee ../check-log_"$LFS_COREUTILS".log;   
-sed -i '/dummy/d' /etc/group &&
+if [ "$MAKECHECK" = TRUE ]; then
+    make NON_ROOT_USERNAME=tester check-root &&
+    echo "dummy:x:102:tester" >> /etc/group &&
+    chown -Rv tester . &&
+    su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check" | tee ../check-log_"$LFS_COREUTILS".log;   
+    sed -i '/dummy/d' /etc/group
+fi
 make install &&
 mv -v /usr/bin/chroot /usr/sbin &&
 mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8 &&
@@ -494,7 +524,9 @@ tar xf "$LFS_CHECK".tar.gz &&
 cd "$LFS_CHECK" &&
 ./configure --prefix=/usr --disable-static &&
 make &&
-make check | tee ../check-log_"$LFS_CHECK".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_CHECK".log;
+fi
 make docdir=/usr/share/doc/check-0.15.2 install &&
 cd .. &&
 rm -rf "$LFS_CHECK" &&
@@ -512,7 +544,9 @@ tar xf "$LFS_DIFFUTILS".tar.xz &&
 cd "$LFS_DIFFUTILS" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_DIFFUTILS".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_DIFFUTILS".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_DIFFUTILS" &&
@@ -531,7 +565,9 @@ cd "$LFS_GAWK" &&
 sed -i 's/extras//' Makefile.in &&
 ./configure --prefix=/usr &&
 make &&
-# make check | tee ../check-log_"$LFS_GAWK".log; # hangs
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_GAWK".log;
+fi
 make LN='ln -f' install &&
 mkdir -pv                                   /usr/share/doc/gawk-5.2.1 &&
 cp    -v doc/{awkforai.txt,*.{eps,pdf,jpg}} /usr/share/doc/gawk-5.2.1 &&
@@ -554,8 +590,10 @@ case $(uname -m) in
     x86_64) ./configure --prefix=/usr --localstatedir=/var/lib/locate ;;
 esac &&
 make &&
-chown -Rv tester . &&
-su tester -c "PATH=$PATH make check" | tee ../check-log_"$LFS_FINDUTILS".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    chown -Rv tester . &&
+    su tester -c "PATH=$PATH make check" | tee ../check-log_"$LFS_FINDUTILS".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_FINDUTILS" &&
@@ -613,7 +651,9 @@ tar xf "$LFS_GZIP".tar.xz &&
 cd "$LFS_GZIP" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_GZIP".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_GZIP".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_GZIP" &&
@@ -654,7 +694,9 @@ sed -i '/RESIZECONS_PROGS=/s/yes/no/' configure &&
 sed -i 's/resizecons.8 //' docs/man/man8/Makefile.in &&
 ./configure --prefix=/usr --disable-vlock &&
 make &&
-make check | tee ../check-log_"$LFS_KBD".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_KBD".log;
+fi
 make install &&
 mkdir -pv           /usr/share/doc/kbd-2.5.1 &&
 cp -R -v docs/doc/* /usr/share/doc/kbd-2.5.1 &&
@@ -674,7 +716,9 @@ tar xf "$LFS_LIBPIPELINE".tar.gz &&
 cd "$LFS_LIBPIPELINE" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_LIBPIPELINE".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_LIBPIPELINE".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_LIBPIPELINE" &&
@@ -695,7 +739,9 @@ sed -e '/ifdef SIGPIPE/,+2 d' \
     -i src/main.c &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_MAKE".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_MAKE".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_MAKE" &&
@@ -713,7 +759,9 @@ tar xf "$LFS_PATCH".tar.xz &&
 cd "$LFS_PATCH" &&
 ./configure --prefix=/usr &&
 make &&
-make check | tee ../check-log_"$LFS_PATCH".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_PATCH".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_PATCH" &&
@@ -732,7 +780,9 @@ cd "$LFS_TAR" &&
 FORCE_UNSAFE_CONFIGURE=1  \
 ./configure --prefix=/usr &&
 make &&
-# make check | tee ../check-log_"$LFS_TAR".log; # hangs
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_TAR".log;
+fi
 make install &&
 make -C doc install-html docdir=/usr/share/doc/tar-1.34 &&
 cd .. &&
@@ -751,7 +801,9 @@ tar xf "$LFS_TEXINFO".tar.xz &&
 cd "$LFS_TEXINFO" &&
 ./configure --prefix=/usr &&
 make &&
-# make check | tee ../check-log_"$LFS_TEXINFO".log; # hangs
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_TEXINFO".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_TEXINFO" &&
@@ -770,9 +822,11 @@ cd "$LFS_VIM" &&
 echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h &&
 ./configure --prefix=/usr &&
 make &&
-# chown -Rv tester .;
-# su tester -c "LANG=en_US.UTF-8 make -j1 test" &> vim-test.log;
-# cp vim-test.log ../check-log_"$LFS_VIM".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    chown -Rv tester .;
+    su tester -c "LANG=en_US.UTF-8 make -j1 test" &> vim-test.log;
+    cp vim-test.log ../check-log_"$LFS_VIM".log;
+fi
 make install &&
 ln -sv vim /usr/bin/vi &&
 for L in  /usr/share/man/{,*/}man1/vim.1; do
@@ -920,7 +974,9 @@ cd "$LFS_MANDB" &&
             --with-vgrind=/usr/bin/vgrind         \
             --with-grap=/usr/bin/grap             &&
 make &&
-make check | tee ../check-log_"$LFS_MANDB".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_MANDB".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_MANDB" &&
@@ -942,7 +998,9 @@ cd "$LFS_PROCPSNG" &&
             --disable-kill                          \
             --with-systemd                          &&
 make &&
-make check | tee ../check-log_"$LFS_MANDB".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_MANDB".log;
+fi
 make install &&
 cd .. &&
 rm -rf "$LFS_PROCPSNG" &&
@@ -998,7 +1056,9 @@ cd       build &&
              --disable-uuidd         \
              --disable-fsck          &&
 make &&
-make check | tee ../check-log_"$LFS_E2FSPROGS".log;
+if [ "$MAKECHECK" = TRUE ]; then
+    make check | tee ../check-log_"$LFS_E2FSPROGS".log;
+fi
 make install &&
 rm -fv /usr/lib/{libcom_err,libe2p,libext2fs,libss}.a &&
 gunzip -v /usr/share/info/libext2fs.info.gz &&
diff --git a/vars.sh b/vars.sh
index 5747332..f5e376e 100644
--- a/vars.sh
+++ b/vars.sh
@@ -10,6 +10,7 @@ export DOMAIN="fritz.box"
 export KEYMAP="de-latin1"   # default "en"
 export LOCALE="en_US.utf8"
 export TELNETD=TRUE
+export MAKECHECK=FALSE
 
 export LFS="/mnt/lfs"