diff --git a/bot/test.sh b/bot/test.sh
index 168b0d5c..9ab49866 100755
--- a/bot/test.sh
+++ b/bot/test.sh
@@ -175,8 +175,14 @@ export EESSI_SOFTWARE_SUBDIR_OVERRIDE
 echo "bot/test.sh: EESSI_SOFTWARE_SUBDIR_OVERRIDE='${EESSI_SOFTWARE_SUBDIR_OVERRIDE}'"
 
 # determine accelerator target (if any) from .architecture in ${JOB_CFG_FILE}
-export EESSI_ACCELERATOR_TARGET=$(cfg_get_value "architecture" "accelerator")
-echo "bot/test.sh: EESSI_ACCELERATOR_TARGET='${EESSI_ACCELERATOR_TARGET}'"
+ACCEL_OVERRIDE=$(cfg_get_value "architecture" "accelerator")
+if [[ -n "$ACCEL_OVERRIDE" ]]; then
+    # bot job config does not include accel subdirectory
+    export EESSI_ACCELERATOR_TARGET_OVERRIDE="accel/$ACCEL_OVERRIDE"
+else
+    export EESSI_ACCELERATOR_TARGET_OVERRIDE=""
+fi
+echo "bot/test.sh: EESSI_ACCELERATOR_TARGET_OVERRIDE='${EESSI_ACCELERATOR_TARGET_OVERRIDE}'"
 
 # get EESSI_OS_TYPE from .architecture.os_type in ${JOB_CFG_FILE} (default: linux)
 EESSI_OS_TYPE=$(cfg_get_value "architecture" "os_type")
diff --git a/test_suite.sh b/test_suite.sh
index f5f32558..6714ae67 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -155,8 +155,8 @@ export RFM_PREFIX=$PWD/reframe_runs
 
 # Get the correct partition name
 REFRAME_PARTITION_NAME=${EESSI_SOFTWARE_SUBDIR//\//_}
-if [ ! -z "$EESSI_ACCELERATOR_TARGET" ]; then
-    REFRAME_PARTITION_NAME=${REFRAME_PARTITION_NAME}_${EESSI_ACCELERATOR_TARGET//\//_}
+if [ ! -z "$EESSI_ACCELERATOR_TARGET_OVERRIDE" ]; then
+    REFRAME_PARTITION_NAME=${REFRAME_PARTITION_NAME}_${EESSI_ACCELERATOR_TARGET_OVERRIDE//\//_}
 fi
 echo "Constructed partition name based on EESSI_SOFTWARE_SUBDIR and EESSI_ACCELERATOR_TARGET: ${REFRAME_PARTITION_NAME}"