diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88156481..3edae154 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,7 +157,7 @@ aarch64-debian-container_prep:
 # Core templates for all of our build steps. These are reused by all build jobs
 # through the `extends` keyword.
 .build-env:
-  timeout: 5m
+  timeout: 15m
   variables:
     BUILDDIR: $CI_PROJECT_DIR/build-weston-$CI_JOB_NAME
     PREFIX: $CI_PROJECT_DIR/prefix-weston-$CI_JOB_NAME
diff --git a/tests/meson.build b/tests/meson.build
index 0759f057..e3ee1d67 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -320,6 +320,7 @@ foreach t : tests
 		t.get('name'),
 		t_exe,
 		depends: t.get('test_deps', []),
+		timeout: 120,
 		protocol: 'tap'
 	)
 endforeach