diff --git a/script/cibuild b/script/cibuild
index 4d4b6dbe..fdfe0740 100755
--- a/script/cibuild
+++ b/script/cibuild
@@ -1,4 +1,12 @@
 #! /bin/bash
 
 script/branding
-script/$TEST_SUITE
+
+set -e
+
+if test -z "$TEST_SUITE"; then
+  script/test
+  script/cucumber
+else
+  script/$TEST_SUITE
+fi