diff --git a/qa/655 b/qa/655
index 317f9949de..7ddae027e3 100755
--- a/qa/655
+++ b/qa/655
@@ -16,6 +16,7 @@ echo "QA output created by $seq"
 test "$PCP_PLATFORM" = "linux" || _notrun "No resctrl support on PCP_PLATFORM $PCP_PLATFORM"
 test -x "$PCP_BINADM_DIR/pcp-atop" || _notrun "No pcp-atop binary available on this platform"
 test -f /sys/devices/system/cpu/cpu0/cache/index3/size || _notrun "No L3 cache size available"
+test -d /sys/fs/resctrl || _notrun "No /sys/fs/resctrl"
 
 _cleanup()
 {
diff --git a/qa/870 b/qa/870
index 2c509f4f75..6dafd307f4 100755
--- a/qa/870
+++ b/qa/870
@@ -41,7 +41,7 @@ _is_activating()
     then
 	eval `systemctl show --property=ActiveState pmlogger.service`
 	echo "ActiveState=$ActiveState" >>$here/$seq.full
-	[ "$ActiveState" != activating ] && return 0
+	[ "$ActiveState" = activating ] && return 0
     fi
     return 1
 }
diff --git a/qa/group b/qa/group
index b767307fcd..b3ee87d927 100644
--- a/qa/group
+++ b/qa/group
@@ -225,6 +225,7 @@ pmda.json
 pmda.kvm
 pmda.libvirt
 pmda.lio
+#pmda.llc		# note this group has been retired
 pmda.lmsensors
 pmda.logger
 pmda.lustre
@@ -255,8 +256,9 @@ pmda.postfix
 pmda.postgresql
 pmda.proc
 pmda.redis
+pmda.resctrl
 pmda.root
-pmda.rpm		# note this group has been retired
+#pmda.rpm		# note this group has been retired
 pmda.rsyslog
 pmda.sample
 pmda.sendmail
@@ -1111,7 +1113,7 @@ x11
 652 pmda.systemd event flakey
 653 libpcp local
 654 pmda.gfs2 local valgrind
-655 pmda.llc local
+655 pmda.resctrl local
 656 pmda.cifs local valgrind
 657 pmda.dm local
 658 logutil local pmlogrewrite pmlogmv pmlogdump
diff --git a/src/include/builddefs.in b/src/include/builddefs.in
index a0b2de5fe8..4b7c2eed0a 100644
--- a/src/include/builddefs.in
+++ b/src/include/builddefs.in
@@ -133,6 +133,7 @@ LZMACFLAGS = @lzma_CFLAGS@
 LIBUVCFLAGS = @libuv_CFLAGS@
 OPENSSLCFLAGS = @openssl_CFLAGS@
 SASLCFLAGS = @libsasl2_CFLAGS@
+CMOCKACFLAGS = @cmocka_CFLAGS@
 
 LDFLAGS += $(PLDFLAGS) $(WARN_OFF) $(PCP_LIBS) $(LLDFLAGS)