diff --git a/.ci/docker.run b/.ci/docker.run
index 14530cc51..9edb5a652 100755
--- a/.ci/docker.run
+++ b/.ci/docker.run
@@ -40,7 +40,7 @@ if [ "$GEN_FUZZ" == "1" ]; then
     ./configure --with-fuzzing=libfuzzer --enable-tcti-fuzzing \
       --disable-tcti-device --disable-tcti-mssim --disable-tcti-swtpm \
       --disable-shared --with-crypto="$WITH_CRYPTO"
-    make -j 1  check
+    make -j  check
     exit 0
 fi
 
@@ -94,9 +94,9 @@ fi
 if [ "$SCANBUILD" == "yes" ]; then
   scan-build --status-bugs make -j
 elif [ "$CC" == "clang" ]; then
-  make -j 1  distcheck
+  make -j  distcheck
 else
-  make -j 1  check
+  make -j  check
 fi
 
 popd
@@ -111,31 +111,31 @@ if [ "$CC" == "gcc" ]; then
   # only device TCTI
   echo "========================== START TEST - device TCTI =========================="
   mkdir -p ./dev/tpm0 && ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --disable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device --with-device=./dev/tpm0
-  make -j 1  check TESTS="test/unit/tcti-device" && rm -rf ./dev
+  make -j  check TESTS="test/unit/tcti-device" && rm -rf ./dev
   # only mssim TCTI
   echo "========================== START TEST - mssim TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --disable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-mssim"
+  make -j  check TESTS="test/unit/tcti-mssim"
   # device and mssim TCTIs
   echo "========================== START TEST - mssim & device TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --disable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-device test/unit/tcti-mssim"
+  make -j  check TESTS="test/unit/tcti-device test/unit/tcti-mssim"
   # only swtmp TCTI
   echo "========================== START TEST - swtpm TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --enable-tcti-swtpm --disable-tcti-mssim --disable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-swtpm"
+  make -j  check TESTS="test/unit/tcti-swtpm"
   # swtmp and device TCTIs
   echo "========================== START TEST - swtpm & device TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --enable-tcti-swtpm --disable-tcti-mssim --enable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-swtpm test/unit/tcti-device"
+  make -j  check TESTS="test/unit/tcti-swtpm test/unit/tcti-device"
   # swtmp and mssim TCTIs
   echo "========================== START TEST - swtpm & mssim TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --enable-tcti-swtpm --enable-tcti-mssim --disable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim"
+  make -j  check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim"
   # all TCTIs
   echo "========================== START TEST - swtpm & mssim & device TCTI =========================="
   ../configure --disable-doxygen-doc --enable-unit --disable-self-generated-certificate --disable-integration --enable-tcti-swtpm --enable-tcti-mssim --enable-tcti-device
-  make -j 1  check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim test/unit/tcti-device"
+  make -j  check TESTS="test/unit/tcti-swtpm test/unit/tcti-mssim test/unit/tcti-device"
 fi # CC == gcc
 popd
 fi # TEST_TCTI_CONFIG
diff --git a/Makefile-test.am b/Makefile-test.am
index 30e44504b..7711329d8 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -110,74 +110,8 @@ TESTS_UNIT  = \
     test/unit/sys-execute \
     test/unit/dlopen_tss2_rc \
     test/unit/tss2_rc
-if ENABLE_TCTI_MSSIM
-TESTS_UNIT += test/unit/tcti-mssim
-endif
-if ENABLE_TCTI_SWTPM
-TESTS_UNIT += test/unit/tcti-swtpm
-endif
-if ENABLE_TCTI_LIBTPMS
-TESTS_UNIT += test/unit/tcti-libtpms
-endif
-if ENABLE_TCTI_DEVICE
-TESTS_UNIT += test/unit/tcti-device
-endif
-if ENABLE_TCTI_PCAP
-TESTS_UNIT += test/unit/tcti-pcap
-endif
-if ENABLE_TCTI_CMD
-TESTS_UNIT += test/unit/tcti-cmd
-endif
-if ENABLE_TCTI_SPI_HELPER
-TESTS_UNIT += test/unit/tcti-spi-helper
-endif
-if ENABLE_TCTI_SPI_LTT2GO
-TESTS_UNIT += test/unit/tcti-spi-ltt2go
-endif
-if ENABLE_TCTI_SPIDEV
-TESTS_UNIT += test/unit/tcti-spidev
-endif
-if ENABLE_TCTI_SPI_FTDI
-TESTS_UNIT += test/unit/tcti-spi-ftdi
-endif
-if ENABLE_TCTI_I2C_HELPER
-TESTS_UNIT += test/unit/tcti-i2c-helper
-endif
-if ENABLE_TCTI_I2C_FTDI
-TESTS_UNIT += test/unit/tcti-i2c-ftdi
-endif
-if ESYS
-TESTS_UNIT += \
-    test/unit/esys-context-null \
-    test/unit/esys-resubmissions \
-    test/unit/esys-sequence-finish \
-    test/unit/esys-tcti-rcs \
-    test/unit/esys-tpm-rcs \
-    test/unit/esys-getpollhandles \
-    test/unit/esys-ac-getcapability \
-    test/unit/esys-ac-send \
-    test/unit/esys-policy-ac-sendselect \
-    test/unit/esys-nulltcti \
-    test/unit/esys-crypto
-if VENDOR
-TESTS_UNIT += test/unit/esys-vendor
-endif # VENDOR
 
-endif ESYS
-if FAPI
-TESTS_CFLAGS +=  -DTOP_SOURCEDIR"=\"$(top_srcdir)\""
-TESTS_UNIT += \
-    test/unit/fapi-json \
-    test/unit/fapi-helpers \
-    test/unit/fapi-io \
-    test/unit/fapi-profiles \
-    test/unit/fapi-config \
-    test/unit/fapi-get-web-cert \
-    test/unit/fapi-eventlog \
-    test/unit/fapi-ima-eventlog \
-    test/unit/fapi-check-ima-log
-
-endif FAPI
+
 endif #UNIT
 
 if ENABLE_INTEGRATION