diff --git a/tests/msgbuf_parse1.c b/tests/msgbuf_parse1.c
index 631df7e4..7712c6a1 100644
--- a/tests/msgbuf_parse1.c
+++ b/tests/msgbuf_parse1.c
@@ -3313,6 +3313,7 @@ int main(int argc, char *argv[])
 	basic_tags4();
 	basic_tags5a();
 	basic_tags5b();
+	basic_tags13();
 	basic_tags14();
 	basic_tags15();
 	basic_tags16();
@@ -3374,6 +3375,7 @@ int main(int argc, char *argv[])
 	long_para4();
 
 	too_long_para1();
+	too_long_para2();
 
 	long_everything1();
 	long_everything2();
@@ -3397,6 +3399,7 @@ int main(int argc, char *argv[])
 	origin_no_para_0_spaces();
 	origin_no_para_1_space();
 	origin_no_para_2_spaces();
+	origin_no_para_3_spaces();
 
 	unescape_test();
 	unescape_bad_test1();
diff --git a/tests/msgbuf_unparse1.c b/tests/msgbuf_unparse1.c
index d5bdba7b..5024d05a 100644
--- a/tests/msgbuf_unparse1.c
+++ b/tests/msgbuf_unparse1.c
@@ -31,7 +31,6 @@
 #define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
 
 struct Client me;
-static char tmp[2048];
 static const char text[] =
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
 "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba9876543210abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -2879,6 +2878,7 @@ int main(int argc, char *argv[])
 	exact_space_for_tag2b();
 
 	escape_test();
+	escape_test_8bit();
 
 	long_para1a();
 	too_long_para1a();
diff --git a/tests/rb_linebuf_put1.c b/tests/rb_linebuf_put1.c
index 7854fd49..b661de0e 100644
--- a/tests/rb_linebuf_put1.c
+++ b/tests/rb_linebuf_put1.c
@@ -31,7 +31,6 @@
 #define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
 
 struct Client me;
-static char tmp[2048];
 static const char text[] =
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
 "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba9876543210abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
@@ -486,7 +485,6 @@ static void long_msgf2(void)
 {
 	buf_head_t linebuf;
 	char output[2048] = { 0 };
-	char prefix[2048] = { 0 };
 	int len;
 
 	rb_linebuf_newbuf(&linebuf);
@@ -509,7 +507,6 @@ static void too_long_msgf2(void)
 {
 	buf_head_t linebuf;
 	char output[2048] = { 0 };
-	char prefix[2048] = { 0 };
 	int len;
 
 	rb_linebuf_newbuf(&linebuf);
@@ -593,7 +590,6 @@ static void long_vmsg2(void)
 {
 	buf_head_t linebuf;
 	char output[2048] = { 0 };
-	char prefix[2048] = { 0 };
 	int len;
 
 	rb_linebuf_newbuf(&linebuf);
@@ -616,7 +612,6 @@ static void too_long_vmsg2(void)
 {
 	buf_head_t linebuf;
 	char output[2048] = { 0 };
-	char prefix[2048] = { 0 };
 	int len;
 
 	rb_linebuf_newbuf(&linebuf);
diff --git a/tests/substitution1.c b/tests/substitution1.c
index 59c91c95..0dfb897d 100644
--- a/tests/substitution1.c
+++ b/tests/substitution1.c
@@ -31,7 +31,6 @@
 #define MSG "%s:%d (%s)", __FILE__, __LINE__, __FUNCTION__
 
 struct Client me;
-static char tmp[2048];
 static const char text[] =
 "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba"
 "ZYXWVUTSRQPONMLKJIHGFEDCBAzyxwvutsrqponmlkjihgfedcba9876543210abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"