diff --git a/autotest_lib.sh b/autotest_lib.sh
index 9b95d2433a..311bad46fe 100644
--- a/autotest_lib.sh
+++ b/autotest_lib.sh
@@ -15,13 +15,14 @@ function check_board() {
   local board_names=""
   local index=1
   local found=0
+  local board_basename=$(echo "${FLAGS_board}" |cut -d '_' -f 1)
   for overlay_path in "${SRC_ROOT}"/overlays/overlay-*
   do
     local overlay=$(basename "${overlay_path}")
     local board="${overlay#overlay-}"
     board_names[index]="${board}"
     index+=1
-    if [ "${FLAGS_board}" == "${board}" ]
+    if [ "${board_basename}" == "${board}" ]
     then
       found=1
     fi
diff --git a/build_autotest.sh b/build_autotest.sh
index 5b929ac980..d96cd8e333 100755
--- a/build_autotest.sh
+++ b/build_autotest.sh
@@ -52,7 +52,8 @@ do
 done
 
 # Load the overlay specific blacklist and remove any matching tests.
-PRIMARY_BOARD_OVERLAY="${SRC_ROOT}/overlays/overlay-${FLAGS_board}"
+BOARD_BASENAME=$(echo "${FLAGS_board}" |cut -d '_' -f 1)
+PRIMARY_BOARD_OVERLAY="${SRC_ROOT}/overlays/overlay-${BOARD_BASENAME}"
 BLACKLIST_FILE="${PRIMARY_BOARD_OVERLAY}/autotest-blacklist"
 if [ -r "${BLACKLIST_FILE}" ]
 then