1 files changed, 6 insertions, 18 deletions
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 6c310ccc76..1baeb090a8 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -8,29 +8,17 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
-enter_suite build
+run_suite 'build_nvim' 'build'
 
-check_core_dumps --delete quiet
-
-prepare_build
-build_nvim
-
-exit_suite --continue
-
-enter_suite tests
-
-if test "$CLANG_SANITIZER" != "TSAN" ; then
+if test "$CLANG_SANITIZER" != "TSAN"; then
   # Additional threads are only created when the builtin UI starts, which
   # doesn't happen in the unit/functional tests
   if test "${FUNCTIONALTEST}" != "functionaltest-lua"; then
-    run_test run_unittests unittests
+    run_suite run_unittests unittests
   fi
-  run_test run_functionaltests functionaltests
+  run_suite run_functionaltests functionaltests
 fi
-run_test run_oldtests oldtests
-
-run_test install_nvim install_nvim
-
-exit_suite --continue
+run_suite run_oldtests oldtests
+run_suite install_nvim install_nvim
 
 end_tests