diff --git a/device.mk b/device.mk
index 54299a8a..444fa36e 100644
--- a/device.mk
+++ b/device.mk
@@ -749,11 +749,12 @@ PRODUCT_PACKAGES += \
 endif
 
 # Trusty (KM, GK, Storage)
-#$(call inherit-product, system/core/trusty/trusty-storage.mk)
-#$(call inherit-product, system/core/trusty/trusty-base.mk)
+$(call inherit-product, system/core/trusty/trusty-storage.mk)
+$(call inherit-product, system/core/trusty/trusty-base.mk)
 
 # Trusty unit test tool
-PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl
+PRODUCT_PACKAGES_DEBUG += trusty-ut-ctrl \
+   tipc-test
 
 # Trusty ConfirmationUI HAL
 #PRODUCT_PACKAGES += \