diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71a5f817f..896153aab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,7 +80,7 @@ add_subdirectory(lib/fih)
 add_subdirectory(tools)
 add_subdirectory(secure_fw)
 
-if(NS OR TFM_S_REG_TEST OR TFM_NS_REG_TEST OR TEST_BL2)
+if(NS OR TFM_S_REG_TEST OR TFM_NS_REG_TEST OR TEST_BL2 OR TEST_BL1_1 OR TEST_BL1_2)
     add_subdirectory(${TFM_TEST_REPO_PATH} ${CMAKE_CURRENT_BINARY_DIR}/tf-m-tests)
 endif()
 
diff --git a/bl1/bl1_1/main.c b/bl1/bl1_1/main.c
index ad382d142..4238a4216 100644
--- a/bl1/bl1_1/main.c
+++ b/bl1/bl1_1/main.c
@@ -67,6 +67,10 @@ int main(void)
         FIH_PANIC;
     }
 
+#ifdef TEST_BL1_1
+    run_bl1_1_testsuite();
+#endif /* TEST_BL1_1 */
+
     /* Copy BL1_2 from OTP into SRAM*/
     FIH_CALL(bl1_read_bl1_2_image, fih_rc, (uint8_t *)BL1_2_CODE_START);
     if (fih_not_eq(fih_rc, FIH_SUCCESS)) {
diff --git a/bl1/bl1_2/main.c b/bl1/bl1_2/main.c
index d5740634e..d5cf60772 100644
--- a/bl1/bl1_2/main.c
+++ b/bl1/bl1_2/main.c
@@ -191,6 +191,10 @@ int main(void)
         FIH_PANIC;
     }
 
+#ifdef TEST_BL1_2
+    run_bl1_2_testsuite();
+#endif /* TEST_BL1_2 */
+
     BL1_LOG("[INF] Attempting to boot image 0\r\n");
     FIH_CALL(validate_image, fih_rc, 0);
     if (fih_not_eq(fih_rc, FIH_SUCCESS)) {