diff --git a/test/bootm.c b/test/bootm.c
index 26c1555..52b83f1 100644
--- a/test/bootm.c
+++ b/test/bootm.c
@@ -26,12 +26,15 @@
 {
 	char buf[BUF_SIZE];
 
+	/* This tests relies on GD_FLG_SILENT not being set */
+	gd->flags &= ~GD_FLG_SILENT;
+
 	*buf = '\0';
-	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true));
+	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL));
 	ut_asserteq_str("", buf);
 
 	strcpy(buf, "test");
-	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true));
+	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL));
 	ut_asserteq_str("test", buf);
 
 	return 0;
@@ -43,23 +46,26 @@
 {
 	char buf[BUF_SIZE];
 
+	/* This tests relies on GD_FLG_SILENT not being set */
+	gd->flags &= ~GD_FLG_SILENT;
+
 	/* Zero buffer size */
 	*buf = '\0';
-	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, true));
+	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, 0, BOOTM_CL_ALL));
 
 	/* Buffer string not terminated */
 	memset(buf, 'a', BUF_SIZE);
-	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true));
+	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL));
 
 	/* Not enough space to copy string */
 	memset(buf, '\0', BUF_SIZE);
 	memset(buf, 'a', BUF_SIZE / 2);
-	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, true));
+	ut_asserteq(-ENOSPC, bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL));
 
 	/* Just enough space */
 	memset(buf, '\0', BUF_SIZE);
 	memset(buf, 'a', BUF_SIZE / 2 - 1);
-	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, true));
+	ut_assertok(bootm_process_cmdline(buf, BUF_SIZE, BOOTM_CL_ALL));
 
 	return 0;
 }
@@ -70,6 +76,9 @@
 {
 	char buf[BUF_SIZE];
 
+	/* This tests relies on GD_FLG_SILENT not being set */
+	gd->flags &= ~GD_FLG_SILENT;
+
 	/* 'silent_linux' not set should do nothing */
 	env_set("silent_linux", NULL);
 	strcpy(buf, CONSOLE_STR);