diff --git a/config/common.mk b/config/common.mk
index 6d2887b7e5163b90e6bb17236f73d3b937f1cb9e..5d0257fcc3b965a69bea8ace04becc36e7580b1e 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -202,6 +202,15 @@ ifdef CUSTOM_PACKAGES
 PRODUCT_PACKAGES += $(CUSTOM_PACKAGES)
 endif
 
+# If TEST_BUILD is not set, set it to false by default.
+ifndef TEST_BUILD
+  TEST_BUILD := false
+endif
+
+ifeq ($(TEST_BUILD),true)
+  PRODUCT_PACKAGES += BlissLauncher_Test
+endif
+
 
 # Filesystems tools
 PRODUCT_PACKAGES += \