diff --git a/test_suite.sh b/test_suite.sh
index fa6ece2012..d347ab0b7a 100755
--- a/test_suite.sh
+++ b/test_suite.sh
@@ -265,15 +265,12 @@ fi
 if [ -z "$REFRAME_ADDITIONAL_ARGS" ]; then
     REFRAME_ADDITIONAL_ARGS=""
 fi
-export REFRAME_NAME_ARGS=$(echo "$REFRAME_NAME_ARGS" | tr -d "'")
 export REFRAME_ARGS="${REFRAME_CI_TAG} ${REFRAME_SCALE_TAG} ${REFRAME_ADDITIONAL_ARGS} --nocolor ${REFRAME_NAME_ARGS}"
+export REFRAME_ARGS=${REFRAME_ARGS//\"/}
 
 # List the tests we want to run
 echo "Listing tests: reframe ${REFRAME_ARGS} --list"
-echo ${REFRAME_ARGS}
-echo "${REFRAME_ARGS}"
-echo $REFRAME_ARGS
-reframe ${REFRAME_CI_TAG} ${REFRAME_SCALE_TAG} ${REFRAME_ADDITIONAL_ARGS} --nocolor ${REFRAME_NAME_ARGS} --list -v
+reframe ${REFRAME_ARGS} --list -v
 if [[ $? -eq 0 ]]; then
     echo_green "Succesfully listed ReFrame tests with command: reframe ${REFRAME_ARGS} --list"
 else
@@ -282,7 +279,7 @@ fi
 
 # Run all tests
 echo "Running tests: reframe ${REFRAME_ARGS} --run"
-reframe ${REFRAME_CI_TAG} ${REFRAME_SCALE_TAG} ${REFRAME_ADDITIONAL_ARGS} --nocolor $REFRAME_NAME_ARGS --run
+reframe ${REFRAME_ARGS} --run
 reframe_exit_code=$?
 if [[ ${reframe_exit_code} -eq 0 ]]; then
     echo_green "ReFrame runtime ran succesfully with command: reframe ${REFRAME_ARGS} --run."