diff --git a/run_tests.sh b/run_tests.sh
index de7fd8c2e1..1dbb47db9d 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -21,4 +21,4 @@ source ${base_dir}/init/eessi_defaults
 ./run_in_compat_layer_env.sh "git clone https://github.com/EESSI/test-suite EESSI-test-suite"
 
 # Run the test suite
-./test_suite.sh
+./test_suite.sh "$@"
diff --git a/test_suite.sh b/test_suite.sh
index e3bab04aec..95eb9daa2a 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -23,7 +23,7 @@ POSITIONAL_ARGS=()
 while [[ $# -gt 0 ]]; do
   case $1 in
     -g|--generic)
-      EASYBUILD_OPTARCH="GENERIC"
+      DETECTION_PARAMETERS="--generic"
       shift
       ;;
     -h|--help)
@@ -75,10 +75,9 @@ TMPDIR=$(mktemp -d)
 
 echo ">> Setting up environment..."
 module --force purge
-# Make sure defaults are set for EESSI_CVMFS_REPO and EESSI_VERSION, before initializing EESSI
-source $TOPDIR/init/eessi_defaults
-# Initialize EESSI
-source ${EESSI_CVMFS_REPO}/versions/${EESSI_VERSION}/init/bash
+export EESSI_SOFTWARE_SUBDIR_OVERRIDE=$(python3 $TOPDIR/eessi_software_subdir.py $DETECTION_PARAMETERS)
+
+source $TOPDIR/init/bash
 
 # Load the ReFrame module
 # Currently, we load the default version. Maybe we should somehow make this configurable in the future?