diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 48c9557ac7..fa397767c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ image: ubuntu:18.04
     - wget -O /tmp/llvm.key https://apt.llvm.org/llvm-snapshot.gpg.key
     - apt-key add /tmp/llvm.key
     - apt-get update
-    - apt-get install -y clang-8 clang-tools-8 clang-8-doc libclang-common-8-dev libclang-8-dev libclang1-8 clang-format-8 python-clang-8 libz3-dev
+    - apt-get install -y clang-9 clang-tools-9 clang-9-doc libclang-common-9-dev libclang-9-dev libclang1-9 clang-format-9 python-clang-9 libz3-dev
     - export PATH=$PWD/racket/bin:$PATH
     
 envinfo:
@@ -91,22 +91,22 @@ test:ubsan:cs:
   script:
     - mkdir cs-logs
     - make CPUS="2" PKGS="racket-test db-test unstable-flonum-lib net-test" CONFIGURE_ARGS_qq="--enable-ubsan CFLAGS="-fno-var-tracking-assignments"" cs 2>&1 | tee cs-logs/build.log
-    - raco test -l tests/racket/test 2>&1 | tee cs-logs/test.log
-    - racket -l tests/racket/contract/all 2>&1 | tee cs-logs/contract-test.log
-    - raco test -l tests/json/json 2>&1 | tee cs-logs/json-test.log
-    - raco test -l tests/file/main 2>&1 | tee cs-logs/file-test.log
-    - raco test -l tests/net/head 2>&1 | tee cs-logs/net-head-test.log
-    - raco test -l tests/net/uri-codec 2>&1 | tee cs-logs/net-uri-codec-test.log
-    - raco test -l tests/net/url 2>&1 | tee cs-logs/net-url-test.log
-    - raco test -l tests/net/url-port 2>&1 | tee cs-logs/net-url-port-test.log
-    - raco test -l tests/net/encoders 2>&1 | tee cs-logs/net-encoders-test.log
-    - raco test -l tests/openssl/basic 2>&1 | tee cs-logs/openssl-basic-test.log
-    - raco test -l tests/openssl/https 2>&1 | tee cs-logs/openssl-https-test.log
-    - raco test -l tests/match/main 2>&1 | tee cs-logs/match-main-test.log
-    - raco test -l tests/zo-path 2>&1 | tee cs-logs/zo-path-test.log
-    - raco test -l tests/xml/test 2>&1 | tee cs-logs/xml-test.log
-    - raco test -l tests/db/all-tests 2>&1 | tee cs-logs/db-test.log
-    - raco test -c tests/stxparse 2>&1 | tee cs-logs/stxparse-test.log
+    - racocs test -l tests/racket/test 2>&1 | tee cs-logs/test.log
+    - racketcs -l tests/racket/contract/all 2>&1 | tee cs-logs/contract-test.log
+    - racocs test -l tests/json/json 2>&1 | tee cs-logs/json-test.log
+    - racocs test -l tests/file/main 2>&1 | tee cs-logs/file-test.log
+    - racocs test -l tests/net/head 2>&1 | tee cs-logs/net-head-test.log
+    - racocs test -l tests/net/uri-codec 2>&1 | tee cs-logs/net-uri-codec-test.log
+    - racocs test -l tests/net/url 2>&1 | tee cs-logs/net-url-test.log
+    - racocs test -l tests/net/url-port 2>&1 | tee cs-logs/net-url-port-test.log
+    - racocs test -l tests/net/encoders 2>&1 | tee cs-logs/net-encoders-test.log
+    - racocs test -l tests/openssl/basic 2>&1 | tee cs-logs/openssl-basic-test.log
+    - racocs test -l tests/openssl/https 2>&1 | tee cs-logs/openssl-https-test.log
+    - racocs test -l tests/match/main 2>&1 | tee cs-logs/match-main-test.log
+    - racocs test -l tests/zo-path 2>&1 | tee cs-logs/zo-path-test.log
+    - racocs test -l tests/xml/test 2>&1 | tee cs-logs/xml-test.log
+    - racocs test -l tests/db/all-tests 2>&1 | tee cs-logs/db-test.log
+    - racocs test -c tests/stxparse 2>&1 | tee cs-logs/stxparse-test.log
   after_script:
     - grep 'runtime error' cs-logs/*.log > runtime-errors.log
   artifacts: