diff --git a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
index 325d8bf..ba146bc 100644
--- a/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
+++ b/meta-ibm/recipes-phosphor/leds/phosphor-led-manager_%.bbappend
@@ -6,7 +6,8 @@
 SYSTEMD_ENVIRONMENT_FILE_${PN}-ledmanager_append_rainier +="obmc/led/set-all/groups/config"
 
 # Use the JSON configuration file at runtime than the static led.yaml
-PACKAGECONFIG_append_rainier = " use-json"
+# Also, enable Lamp Test feature for rainier systems
+PACKAGECONFIG_append_rainier = " use-json use-lamp-test"
 
 pkg_postinst_${PN}-ledmanager_rainier () {
 
diff --git a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
index 01932d2..beaf931 100644
--- a/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
+++ b/meta-phosphor/recipes-phosphor/leds/phosphor-led-manager_git.bb
@@ -15,6 +15,7 @@
 
 PACKAGECONFIG ??= ""
 PACKAGECONFIG[use-json] = "--enable-use-json, --disable-use-json"
+PACKAGECONFIG[use-lamp-test] = "--enable-use-lamp-test, --disable-use-lamp-test"
 
 PACKAGE_BEFORE_PN += "${LED_MGR_PACKAGES}"
 ALLOW_EMPTY_${PN} = "1"