diff --git a/lib/printf/vfprintf.c b/lib/printf/vfprintf.c
index a0634cde4b..8c7a8a58c4 100644
--- a/lib/printf/vfprintf.c
+++ b/lib/printf/vfprintf.c
@@ -138,7 +138,7 @@ __wcsconv(wchar_t *wcsarg, int prec)
  * write a uintmax_t in octal (plus one byte).
  */
 #if UINTMAX_MAX <= UINT64_MAX
-#define	BUF	64
+#define	BUF	80
 #else
 #error "BUF must be large enough to format a uintmax_t"
 #endif
diff --git a/tests/lib/test_table.c b/tests/lib/test_table.c
index 290657bd56..9b6539e3bc 100644
--- a/tests/lib/test_table.c
+++ b/tests/lib/test_table.c
@@ -20,7 +20,7 @@
  */
 
 #include <zebra.h>
-
+#include "printfrr.h"
 #include "prefix.h"
 #include "table.h"
 
@@ -113,7 +113,7 @@ static void print_subtree(struct route_node *rn, const char *legend,
 		printf("  ");
 	}
 
-	printf("%s: %pFX", legend, &rn->p);
+	printfrr("%s: %pFX", legend, &rn->p);
 	if (!rn->info) {
 		printf(" (internal)");
 	}