diff --git a/Makefile-test.am b/Makefile-test.am
index 1852897b0..3540976f2 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -82,102 +82,7 @@ $(FAPI_TEST_BINS) : %.bin : %.b64
 	$(AM_V_GEN)$(call make_bin,$@,$<)
 
 if UNIT
-TESTS_UNIT  = \
-    test/unit/CommonPreparePrologue \
-    test/unit/CopyCommandHeader \
-    test/unit/io \
-    test/unit/key-value-parse \
-    test/unit/log \
-    test/unit/tctildr \
-    test/unit/tctildr-dl \
-    test/unit/tctildr-nodl \
-    test/unit/tctildr-tcti \
-    test/unit/tctildr-getinfo \
-    test/unit/dlopen-fail \
-    test/unit/dlopen-UINT8-marshal \
-    test/unit/dlopen-TPM2B-marshal \
-    test/unit/dlopen-TPMU-marshal \
-    test/unit/UINT8-marshal \
-    test/unit/UINT16-marshal \
-    test/unit/UINT32-marshal \
-    test/unit/UINT64-marshal \
-    test/unit/TPMA-marshal \
-    test/unit/TPM2B-marshal \
-    test/unit/TPMS-marshal \
-    test/unit/TPML-marshal \
-    test/unit/TPMT-marshal \
-    test/unit/TPMU-marshal \
-    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
+TESTS_UNIT  = test/unit/io
 endif #UNIT
 
 if ENABLE_INTEGRATION
@@ -1068,7 +973,6 @@ noinst_PROGRAMS += test/unit/fapi-system-fuzzing
 endif # FAPI
 
 if POLICY
-TESTS_UNIT += test/unit/tss2_policy
 
 test_unit_tss2_policy_CFLAGS  = $(CMOCKA_CFLAGS) $(TESTS_CFLAGS)
 test_unit_tss2_policy_LDADD   = $(CMOCKA_LIBS) $(libtss2_policy) $(libtss2_esys)