diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 0968a0cea3..14919f25e7 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -99,8 +99,12 @@ OELAYOUT_ABI = "8"
 # add poky sanity bbclass
 INHERIT += "poky-sanity"
 
-#WARN_QA = "unsafe-references-in-binaries unsafe-references-in-scripts"
-WARN_QA = "textrel pkgvarcheck"
-ERROR_QA = "dev-so debug-deps dev-deps debug-files arch pkgconfig la perms useless-rpaths rpaths staticdev ldflags"
+# QA check settings - a little stricter than the OE-Core defaults
+WARN_QA = "textrel files-invalid incompatible-license xorg-driver-abi"
+ERROR_QA = "dev-so debug-deps dev-deps debug-files arch pkgconfig la perms \
+            useless-rpaths rpaths staticdev ldflags pkgvarcheck already-stripped \
+            compile-host-path dep-cmp installed-vs-shipped install-host-path \
+            libdir packages-list perm-config perm-line perm-link pkgv-undefined \
+            pn-overrides split-strip var-undefined"
 
 include conf/distro/include/seperatebuilddir.inc