diff --git a/.buildkite/linux/entrypoint b/.buildkite/linux/entrypoint
index ee46cf248..690251561 100755
--- a/.buildkite/linux/entrypoint
+++ b/.buildkite/linux/entrypoint
@@ -4,8 +4,10 @@ set -e
 set -x
 
 # check author has added themselves to CONTRIBUTORS
+echo "--- Checking CONTRIBUTORS"
 .buildkite/linux/check_contributors
 
+echo "--- Building"
 BAZEL="bazel --output_user_root=/state/bazel --output_base=/state/bazel/anki"
 BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore --disk_cache=/state/bazel/disk --repository_cache=/state/bazel/repo"
 
@@ -13,7 +15,10 @@ BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore --disk_cache=/
 test -e /state/node_modules && mv /state/node_modules ts/
 
 $BAZEL build $BUILDARGS ...
+
+echo "+++ Running tests"
 $BAZEL test $BUILDARGS ...
 
+echo "--- Cleanup"
 # if tests succeed, back up node_modules folder
 mv ts/node_modules /state/
diff --git a/.buildkite/mac/entrypoint b/.buildkite/mac/entrypoint
index 5959e6034..508e5ac6b 100755
--- a/.buildkite/mac/entrypoint
+++ b/.buildkite/mac/entrypoint
@@ -3,6 +3,7 @@
 set -e
 set -x
 
+echo "-- Building"
 BAZEL="bazel --output_user_root=~/bazel --output_base=~/bazel/anki"
 BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore"
 
@@ -10,7 +11,10 @@ BUILDARGS="--config=ci --experimental_convenience_symlinks=ignore"
 test -e ~/node_modules && mv ~/node_modules ts/
 
 $BAZEL build $BUILDARGS ...
+
+echo "+++ Running tests"
 $BAZEL test $BUILDARGS ...
 
+echo "--- Cleanup"
 # if tests succeed, back up node_modules folder
 mv ts/node_modules ~/
diff --git a/.buildkite/windows/entrypoint.bat b/.buildkite/windows/entrypoint.bat
index a4537e5ad..e9c9c47f5 100755
--- a/.buildkite/windows/entrypoint.bat
+++ b/.buildkite/windows/entrypoint.bat
@@ -1,3 +1,4 @@
+echo --- Building
 set BAZEL=\bazel\bazel.exe --output_user_root=\bazel\ankici --output_base=\bazel\ankici\base 
 set BUILDARGS=--config=ci
 
@@ -5,12 +6,11 @@ if exist \bazel\node_modules (
     move \bazel\node_modules ts\node_modules
 )
 
-echo Building...
 :: rollup may fail on the first build, so we build once without checking return code
 call %BAZEL% build %BUILDARGS% ... -k
 
 :: now build/test
-echo Running tests...
+echo +++ Running tests
 call %BAZEL% test %BUILDARGS% ...
 IF %ERRORLEVEL% NEQ 0 exit /B 1
 
@@ -36,6 +36,5 @@ IF %ERRORLEVEL% NEQ 0 exit /B 1
 @REM IF %ERRORLEVEL% NEQ 0 exit /B 1
 @REM echo Import succesful.
 
+echo --- Cleanup
 move ts\node_modules \bazel\node_modules
-
-echo All tests pass.