diff --git a/tests/bin/buildbot.sh b/tests/bin/buildbot.sh
index a31ed1a7b2..1112e8a8b4 100755
--- a/tests/bin/buildbot.sh
+++ b/tests/bin/buildbot.sh
@@ -13,6 +13,7 @@ export tauroot
 myhost=`hostname`
 # In case there are extra qualifiers on the hostname
 myhost=`basename -s .nic.uoregon.edu ${myhost}`
+myhost=`basename -s .stor ${myhost}`
 osname=`uname`
 
 # Usage message
diff --git a/tests/bin/doall.sh b/tests/bin/doall.sh
index 710e2b1a7a..4d25a41bdf 100755
--- a/tests/bin/doall.sh
+++ b/tests/bin/doall.sh
@@ -13,6 +13,7 @@ export tauroot
 myhost=`hostname`
 # In case there are extra qualifiers on the hostname
 myhost=`basename -s .nic.uoregon.edu ${myhost}`
+myhost=`basename -s .stor ${myhost}`
 osname=`uname`
 archtype=`arch`
 
@@ -115,12 +116,12 @@ for compiler in "${compilers[@]}" ; do
         fi
     fi
 
-    #test_vanilla
-    #test_threads
+    test_vanilla
+    test_threads
     test_mpi
-    #test_papi
-    #test_python
-    #test_cuda
+    test_papi
+    test_python
+    test_cuda
 done
 
 echo "Success!"
diff --git a/tests/configs/cyclops.llvm.settings b/tests/configs/cyclops.llvm.settings
index 1923e6fcac..faa4ec8c58 100755
--- a/tests/configs/cyclops.llvm.settings
+++ b/tests/configs/cyclops.llvm.settings
@@ -2,9 +2,9 @@
 
 module purge
 module load openmpi/4.0.1-llvm8.0.1
-module swap llvm/8.0.1  llvm/10.0.0
+module swap llvm/8.0.1  llvm/11.1.0
 module load python/3.8.0_shared
-module load cuda/10.1
+module load cuda/10.2
 BFD=/usr/local/packages/binutils/2.34
 PDT=/usr/local/packages/pdtoolkit-3.25.1
 OTF2=/usr/local/packages/otf2/2.1-ppc64le
@@ -15,10 +15,10 @@ export CXX=clang++
 export FC=gfortran
 export COMPILER=gcc
 
-export TAU_OPTIONS="-optRevert -optShared"
+export TAU_OPTIONS="-optRevert -optShared -optCompInst"
 
 # Enable the things that Spack enables by default
-base_support="-bfd=${BFD} -iowrapper -pdt=${PDT} -pdt_c++=g++ -otf=${OTF2}"
+base_support="-bfd=${BFD} -iowrapper -otf=${OTF2}"
 
 # Which tests to run?
 export basic_test_programs="mm"