diff --git a/tests/common_unittests/common_unittests.c b/tests/common_unittests/common_unittests.c
index a2671cd..861cf9a 100644
--- a/tests/common_unittests/common_unittests.c
+++ b/tests/common_unittests/common_unittests.c
@@ -94,12 +94,12 @@
         TEST(iter.required_field_index == 19)
         TEST(iter.submessage_index == 8)
 
-        TEST(pb_field_iter_next(&iter) && iter.tag == 99 && iter.pData == &msg.end && !iter.pSize)
+        TEST(pb_field_iter_next(&iter) && iter.tag == 200 && iter.pData == &msg.extensions && !iter.pSize)
         TEST(iter.required_field_index == 20)
         TEST(iter.submessage_index == 9)
 
-        TEST(pb_field_iter_next(&iter) && iter.tag == 200 && iter.pData == &msg.extensions && !iter.pSize)
-        TEST(iter.required_field_index == 21)
+        TEST(pb_field_iter_next(&iter) && iter.tag == 999 && iter.pData == &msg.end && !iter.pSize)
+        TEST(iter.required_field_index == 20)
         TEST(iter.submessage_index == 9)
 
         TEST(!pb_field_iter_next(&iter))
diff --git a/tests/fuzztest/fuzztest.c b/tests/fuzztest/fuzztest.c
index 3d6bd55..1361712 100644
--- a/tests/fuzztest/fuzztest.c
+++ b/tests/fuzztest/fuzztest.c
@@ -186,7 +186,7 @@
     {
         /* Prepend */
         uint8_t *tmp = malloc_with_check(g_bufsize);
-        size_t s = rand_fill_protobuf(tmp, rand_len(max_size), g_bufsize - *msglen, 512);
+        size_t s = rand_fill_protobuf(tmp, rand_len(max_size), g_bufsize - *msglen, 1000);
         memmove(buffer + s, buffer, *msglen);
         memcpy(buffer, tmp, s);
         free_with_check(tmp);
@@ -195,7 +195,7 @@
     else if (m == 2)
     {
         /* Append */
-        size_t s = rand_fill_protobuf(buffer + *msglen, rand_len(max_size), g_bufsize - *msglen, 512);
+        size_t s = rand_fill_protobuf(buffer + *msglen, rand_len(max_size), g_bufsize - *msglen, 1000);
         *msglen += s;
     }
 }