1 files changed, 12 insertions, 5 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 6347ac15d4..b552e1f520 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -6,6 +6,9 @@ set -o pipefail
 CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
+source "${CI_DIR}/common/suite.sh"
+
+enter_suite tests
 
 check_core_dumps --delete quiet
 
@@ -15,11 +18,15 @@ build_nvim
 if [ "$CLANG_SANITIZER" != "TSAN" ]; then
   # Additional threads are only created when the builtin UI starts, which
   # doesn't happen in the unit/functional tests
-  run_unittests
-  run_functionaltests
+  run_test run_unittests
+  run_test run_functionaltests
 fi
-run_oldtests
+run_test run_oldtests
+
+run_test install_nvim
 
-install_nvim
+if succeeded ; then
+  touch "${SUCCESS_MARKER}"
+fi
 
-touch "${SUCCESS_MARKER}"
+exit_suite