diff --git a/deployments/component-test/component-test.cmake b/deployments/component-test/component-test.cmake
index 3af6d02..deadf11 100644
--- a/deployments/component-test/component-test.cmake
+++ b/deployments/component-test/component-test.cmake
@@ -18,8 +18,11 @@
 		"components/app/ts-demo/test"
 		"components/common/uuid"
 		"components/common/uuid/test"
+		"components/common/tlv"
+		"components/common/tlv/test"
 		"components/rpc/common/caller"
 		"components/rpc/common/interface"
+		"components/rpc/common/test/protocol"
 		"components/rpc/direct"
 		"components/rpc/dummy"
 		"components/service/common"
@@ -32,13 +35,19 @@
 		"components/service/locator/standalone"
 		"components/service/locator/standalone/services/crypto"
 		"components/service/crypto/client/cpp"
+		"components/service/crypto/client/cpp/protobuf"
+		"components/service/crypto/client/cpp/packed-c"
 		"components/service/crypto/client/test"
 		"components/service/crypto/client/test/standalone"
 		"components/service/crypto/provider/mbedcrypto"
 		"components/service/crypto/provider/mbedcrypto/entropy_source/mock"
 		"components/service/crypto/provider/serializer/protobuf"
+		"components/service/crypto/provider/serializer/packed-c"
 		"components/service/crypto/test/unit"
 		"components/service/crypto/test/service"
+		"components/service/crypto/test/service/protobuf"
+		"components/service/crypto/test/service/packed-c"
+		"components/service/crypto/test/protocol"
 		"components/service/secure_storage/client/psa"
 		"components/service/secure_storage/provider/mock_store"
 		"components/service/secure_storage/provider/secure_flash_store"
@@ -47,7 +56,6 @@
 		"components/service/secure_storage/test"
 		"protocols/rpc/common/protobuf"
 		"protocols/rpc/common/packed-c"
-		"protocols/rpc/common/packed-c/test"
 		"protocols/service/crypto/packed-c"
 		"protocols/service/crypto/protobuf"
 		"protocols/service/secure_storage/packed-c"