diff --git a/tools/test.sh b/tools/test.sh
index a727a1784..f94e87b86 100755
--- a/tools/test.sh
+++ b/tools/test.sh
@@ -1582,7 +1582,7 @@ MARKOV="enabled"
 ATTACK=0
 MODE=0
 TYPE="null"
-VECTOR=0
+VECTOR="default"
 HT=0
 PACKAGE=0
 
@@ -1591,19 +1591,14 @@ while getopts "V:T:t:m:a:b:hcpd:x:o:" opt; do
   case ${opt} in
     "V")
       if [ ${OPTARG} == "1" ]; then
-        OPTS="${OPTS} --opencl-vector-width 1"
         VECTOR=1
       elif [ ${OPTARG} == "2" ]; then
-        OPTS="${OPTS} --opencl-vector-width 2"
         VECTOR=2
       elif [ ${OPTARG} == "4" ]; then
-        OPTS="${OPTS} --opencl-vector-width 4"
         VECTOR=4
       elif [ ${OPTARG} == "8" ]; then
-        OPTS="${OPTS} --opencl-vector-width 8"
         VECTOR=8
       elif [ ${OPTARG} == "all" ]; then
-        OPTS="${OPTS} --opencl-vector-width 1,2,4,8"
         VECTOR="all"
       else
         usage
@@ -1709,11 +1704,6 @@ while getopts "V:T:t:m:a:b:hcpd:x:o:" opt; do
 
 done
 
-if [ "${VECTOR}" == "0" ]; then
-   VECTOR="default"
-   OPTS="${OPTS} --opencl-vector-width 1,4"
-fi
-
 if [ "${TYPE}" == "null" ]; then
    TYPE="Gpu"
    OPTS="${OPTS} --opencl-device-types 2"
@@ -1869,6 +1859,8 @@ if [ "${PACKAGE}" -eq 0 -o -z "${PACKAGE_FOLDER}" ]; then
           fi
         fi
       done
+      OPTS="${OPTS_OLD}"
+      VECTOR="${VECTOR_OLD}"
     fi
   done