diff --git a/apps/lib/tlssrp_depr.c b/apps/lib/tlssrp_depr.c
index f03b013428..30c28afd6e 100644
--- a/apps/lib/tlssrp_depr.c
+++ b/apps/lib/tlssrp_depr.c
@@ -178,7 +178,7 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
         goto err;
     }
     BIO_printf(bio_err,
-               "SRP parameters set: username = \"%s\" info=\"%s\" \n",
+               "SRP parameters set: username = \"%s\" info=\"%s\"\n",
                p->login, p->user->info);
     ret = SSL_ERROR_NONE;
 
@@ -199,7 +199,7 @@ int set_up_srp_verifier_file(SSL_CTX *ctx, srpsrvparm *srp_callback_parm,
     srp_callback_parm->login = NULL;
 
     if (srp_callback_parm->vb == NULL) {
-        BIO_printf(bio_err, "Failed to initialize SRP verifier file \n");
+        BIO_printf(bio_err, "Failed to initialize SRP verifier file\n");
         return 0;
     }
     if ((ret =
diff --git a/apps/passwd.c b/apps/passwd.c
index 985a1b9864..260e098b48 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -711,9 +711,9 @@ static char *shacrypt(const char *passwd, const char *magic, const char *salt)
         unsigned int w = ((B2) << 16) | ((B1) << 8) | (B0);             \
         int i = (N);                                                    \
         while (i-- > 0) {                                               \
-                *cp++ = cov_2char[w & 0x3f];                            \
-                w >>= 6;                                                \
-            }                                                           \
+            *cp++ = cov_2char[w & 0x3f];                                \
+            w >>= 6;                                                    \
+        }                                                               \
     } while (0)
 
     switch (magic[0]) {
diff --git a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
index c909045f2a..7576b9d49a 100644
--- a/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
+++ b/demos/pkey/EVP_PKEY_DSA_paramvalidate.c
@@ -145,7 +145,7 @@ int main(int argc, char **argv)
      * a proper FIPS 186-4 key validation which requires extra parameters
      */
     if (EVP_PKEY_param_check(ctx) <= 0) {
-        fprintf(stderr, "Simple EVP_PKEY_param_check() failed \n");
+        fprintf(stderr, "Simple EVP_PKEY_param_check() failed\n");
         goto cleanup;
     }
 
diff --git a/test/quic_client_test.c b/test/quic_client_test.c
index 43adc504c3..35d25a8a8f 100644
--- a/test/quic_client_test.c
+++ b/test/quic_client_test.c
@@ -133,7 +133,7 @@ static int test_quic_client_ex(int fd_arg)
             if (ret != 1) {
                 if (SSL_get_error(c_ssl, ret) == SSL_ERROR_ZERO_RETURN) {
                     c_shutdown = 1;
-                    TEST_info("Message: \n%s\n", msg2);
+                    TEST_info("Message:\n%s\n", msg2);
                 } else if (!TEST_true(is_want(c_ssl, ret))) {
                     goto err;
                 }