diff --git a/test/mdc2test.c b/test/mdc2test.c
index 06456a87a1..e01a2a746c 100644
--- a/test/mdc2test.c
+++ b/test/mdc2test.c
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
     unsigned char md[MDC2_DIGEST_LENGTH];
     int i;
     EVP_MD_CTX *c;
-    static char text[30] = "Now is the time for all ";
+    static char text[] = "Now is the time for all ";
 
 # ifdef CHARSET_EBCDIC
     ebcdic2ascii(text, text, strlen(text));
diff --git a/test/rmdtest.c b/test/rmdtest.c
index c7db9e7294..b5ed73d013 100644
--- a/test/rmdtest.c
+++ b/test/rmdtest.c
@@ -107,8 +107,7 @@ int main(int argc, char *argv[])
     unsigned char md[RIPEMD160_DIGEST_LENGTH];
 
     R = ret;
-    i = 0;
-    while (i < OSSL_NELEM(test)) {
+    for (i = 0; i < OSSL_NELEM(test); i++) {
 # ifdef CHARSET_EBCDIC
         ebcdic2ascii(test[i], test[i], strlen(test[i]));
 # endif
@@ -121,7 +120,6 @@ int main(int argc, char *argv[])
             err++;
         } else
             printf("test %d ok\n", i + 1);
-        i++;
         R++;
     }
     EXIT(err);
diff --git a/test/sha1test.c b/test/sha1test.c
index d2e248c9b7..3e9104a3e7 100644
--- a/test/sha1test.c
+++ b/test/sha1test.c
@@ -92,8 +92,7 @@ int main(int argc, char *argv[])
 
     c = EVP_MD_CTX_new();
     R = ret;
-    i = 0;
-    while (i < OSSL_NELEM(test)) {
+    for (i = 0; i < OSSL_NELEM(test); i++) {
 # ifdef CHARSET_EBCDIC
         ebcdic2ascii(test[i], test[i], strlen(test[i]));
 # endif
@@ -105,7 +104,6 @@ int main(int argc, char *argv[])
             err++;
         } else
             printf("test %d ok\n", i + 1);
-        i++;
         R++;
     }