diff --git a/build/test.sh b/build/test.sh
index 8f0ad4b..137fea2 100644
--- a/build/test.sh
+++ b/build/test.sh
@@ -64,6 +64,5 @@ echo ">>> Running ${COREDIR} test suite..."
 chroot ${STAGEDIR} /bin/sh -es <<EOF
 make -C${COREDIR} lint
 make -C${COREDIR} style
-# XXX does not work well with PRODUCT_SUFFIX set
 make -C${COREDIR} test
 EOF
diff --git a/config/20.1/build.conf b/config/20.1/build.conf
index ac6898f..23c9110 100644
--- a/config/20.1/build.conf
+++ b/config/20.1/build.conf
@@ -4,6 +4,8 @@ PYTHON2?=	27
 PYTHON3?=	37
 RUBY?=		26
 
+SUFFIX?=	-devel
+
 COREBRANCH?=	master
 PLUGINSBRANCH?= master
 SRCBRANCH?=	master