diff --git a/configure/CONFIG_ADDONS b/configure/CONFIG_ADDONS
index bad9ba715..7b4bbac8c 100644
--- a/configure/CONFIG_ADDONS
+++ b/configure/CONFIG_ADDONS
@@ -222,6 +222,17 @@ PROD += $(PROD_DEFAULT)
 endif
 endif
 
+#
+#	concat specific products
+#
+ifneq ($(strip $(TESTPROD_$(OS_CLASS))),)
+TESTPROD += $(subst -nil-,,$(TESTPROD_$(OS_CLASS)))
+else
+ifdef TESTPROD_DEFAULT
+TESTPROD += $(TESTPROD_DEFAULT)
+endif
+endif
+
 #
 #	concat specific scripts
 #