diff --git a/meta/recipes-support/attr/acl/run-ptest b/meta/recipes-support/attr/acl/run-ptest
index f28d8c12122..88dae09fbd1 100644
--- a/meta/recipes-support/attr/acl/run-ptest
+++ b/meta/recipes-support/attr/acl/run-ptest
@@ -4,7 +4,7 @@ failed=0
 all=0
 
 
-for f in *.test; do
+for f in *.run; do
     LD_PRELOAD=$(pwd)/libtestlookup.so ./run $f
     case "$?" in
         0)
diff --git a/meta/recipes-support/attr/acl_2.4.0.bb b/meta/recipes-support/attr/acl_2.4.0.bb
index d470989acc5..a257542185a 100644
--- a/meta/recipes-support/attr/acl_2.4.0.bb
+++ b/meta/recipes-support/attr/acl_2.4.0.bb
@@ -37,16 +37,16 @@ do_install_ptest() {
         install -m644 ${S}/test/*.acl ${D}${PTEST_PATH}/
 
         # Install the tests
-        for t in $(makefile-getvar ${S}/test/Makemodule.am TESTS); do
+        for t in $(makefile-getvar ${B}/Makefile TESTS); do
                 install -m644 ${S}/$t ${D}${PTEST_PATH}/
         done
         # Remove the tests that are expected to fail (they need a NFS server configured)
-        for t in $(makefile-getvar ${S}/test/Makemodule.am XFAIL_TESTS); do
+        for t in $(makefile-getvar ${B}/Makefile XFAIL_TESTS); do
                 rm ${D}${PTEST_PATH}/$(basename $t)
         done
         # These tests need a very specific user/group setup
         # (https://savannah.nongnu.org/bugs/index.php?66927)
-        rm -f ${D}${PTEST_PATH}/getfacl.test ${D}${PTEST_PATH}/permissions.test ${D}${PTEST_PATH}/restore.test ${D}${PTEST_PATH}/setfacl.test
+        rm -f ${D}${PTEST_PATH}/getfacl.run ${D}${PTEST_PATH}/misc.run ${D}${PTEST_PATH}/permissions.run ${D}${PTEST_PATH}/restore.run ${D}${PTEST_PATH}/setfacl.run
 
         ${B}/libtool --mode=install install ${B}/libtestlookup.la ${D}${PTEST_PATH}/
         rm -f ${D}${PTEST_PATH}/*.la
