diff --git a/cloud/agent/e2e/main_test.go b/cloud/agent/e2e/main_test.go
index 4fd06ec..02600fb 100644
--- a/cloud/agent/e2e/main_test.go
+++ b/cloud/agent/e2e/main_test.go
@@ -30,9 +30,8 @@
 
 	apb "source.monogon.dev/cloud/agent/api"
 	bpb "source.monogon.dev/cloud/bmaas/server/api"
-	mpb "source.monogon.dev/metropolis/proto/api"
-
 	"source.monogon.dev/metropolis/pkg/pki"
+	mpb "source.monogon.dev/metropolis/proto/api"
 )
 
 type fakeServer struct {
@@ -284,7 +283,7 @@
 	select {
 	case <-testosStarted:
 		// Done, test passed
-	case <-time.After(10 * time.Second):
+	case <-time.After(30 * time.Second):
 		t.Fatal("Waiting for TestOS launch timed out")
 	}
 }
diff --git a/metropolis/node/core/update/e2e/e2e_test.go b/metropolis/node/core/update/e2e/e2e_test.go
index 4740419..9428464 100644
--- a/metropolis/node/core/update/e2e/e2e_test.go
+++ b/metropolis/node/core/update/e2e/e2e_test.go
@@ -71,7 +71,7 @@
 
 func runAndCheckVariant(t *testing.T, expectedVariant string, qemuArgs []string) {
 	t.Helper()
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
 	qemuCmdLaunch := exec.CommandContext(ctx, "qemu-system-x86_64", qemuArgs...)
 	testosStarted := make(chan string, 1)
@@ -94,7 +94,7 @@
 		case <-procExit:
 			return
 		case <-ctx.Done():
-			t.Error("Timed out waiting for VM to exit")
+			t.Fatal("Timed out waiting for VM to exit")
 			cancel()
 			<-procExit
 			return