diff --git a/cfg.mk b/cfg.mk
index f9a02821..0628dd23 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -21,8 +21,8 @@ local-checks-to-skip = \
     sc_makefile_at_at_check \
     sc_cast_of_argument_to_free \
     sc_prohibit_gnu_make_extensions \
-	\
-	sc_indent
+    \
+    sc_indent
 
 #SHELL=bash -x
 show-vc-list-except:
diff --git a/configure.ac b/configure.ac
index 3ec6eaad..10b867b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ if test -n "$WARN_CFLAGS"; then
     nw="$nw -Wcast-function-type" # gcc 8, very noisy
     nw="$nw -Wabi" # gcc 8, very noisy
     nw="$nw -Wunused-macros" # triggers in auto-generated lex css parser, #pragma doesn't work, conflicts with -Werror
-	nw="$nw -Wchkp" # Deprecated option
+    nw="$nw -Wchkp" # Deprecated option
     nw="$nw -Wswitch-enum" # Too noisy
     nw="$nw -Wswitch-default" # TODO: Enable someday. Too noisy for now
     nw="$nw -Wpedantic" # GCC 11. Too noisy, will never be supported
diff --git a/src/connect.c b/src/connect.c
index 3c4c08cd..326c2d83 100644
--- a/src/connect.c
+++ b/src/connect.c
@@ -380,11 +380,11 @@ connect_to_ip (const ip_address *ip, int port, const char *print)
     if (sock >= 0)
       {
 #ifdef WIN32
-	/* If the connection timed out, fd_close will hang in Gnulib's
-	   close_fd_maybe_socket, inside the call to WSAEnumNetworkEvents.  */
-	if (errno != ETIMEDOUT)
+        /* If the connection timed out, fd_close will hang in Gnulib's
+           close_fd_maybe_socket, inside the call to WSAEnumNetworkEvents.  */
+        if (errno != ETIMEDOUT)
 #endif
-	  fd_close (sock);
+        fd_close (sock);
       }
     errno = save_errno;
     return -1;
diff --git a/src/css.l b/src/css.l
index cf6bc295..a67c9767 100644
--- a/src/css.l
+++ b/src/css.l
@@ -61,14 +61,14 @@ as that of the covered work.  */
 
 %}
 
-h		[0-9a-f]
-nonascii	[\240-\377]
-unicode		\\{h}{1,6}(\r\n|[ \t\r\n\f])?
-escape		{unicode}|\\[^\r\n\f0-9a-f]
-nmstart		[_a-z]|{nonascii}|{escape}
-nmchar		[_a-z0-9-]|{nonascii}|{escape}
-string1		\"([^\n\r\f\\"]|\\{nl}|{escape})*\"
-string2		\'([^\n\r\f\\']|\\{nl}|{escape})*\'
+h               [0-9a-f]
+nonascii        [\240-\377]
+unicode         \\{h}{1,6}(\r\n|[ \t\r\n\f])?
+escape          {unicode}|\\[^\r\n\f0-9a-f]
+nmstart         [_a-z]|{nonascii}|{escape}
+nmchar          [_a-z0-9-]|{nonascii}|{escape}
+string1         \"([^\n\r\f\\"]|\\{nl}|{escape})*\"
+string2         \'([^\n\r\f\\']|\\{nl}|{escape})*\'
 badstring1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\\?
 badstring2      \'([^\n\r\f\\']|\\{nl}|{escape})*\\?
 badcomment1     \/\*[^*]*\*+([^/*][^*]*\*+)*
@@ -76,92 +76,92 @@ badcomment2     \/\*[^*]*(\*+[^/*][^*]*)*
 baduri1         url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
 baduri2         url\({w}{string}{w}
 baduri3         url\({w}{badstring}
-comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/
-ident		-?{nmstart}{nmchar}*
-name		{nmchar}+
-num		[0-9]+|[0-9]*"."[0-9]+
-string		{string1}|{string2}
+comment         \/\*[^*]*\*+([^/*][^*]*\*+)*\/
+ident           -?{nmstart}{nmchar}*
+name            {nmchar}+
+num             [0-9]+|[0-9]*"."[0-9]+
+string          {string1}|{string2}
 badstring       {badstring1}|{badstring2}
 badcomment      {badcomment1}|{badcomment2}
 baduri          {baduri1}|{baduri2}|{baduri3}
-url		([!#$%&*-~]|{nonascii}|{escape})*
-s		[ \t\r\n\f]+
-w		{s}?
-nl		\n|\r\n|\r|\f
-
-A		a|\\0{0,4}(41|61)(\r\n|[ \t\r\n\f])?
-C		c|\\0{0,4}(43|63)(\r\n|[ \t\r\n\f])?
-D		d|\\0{0,4}(44|64)(\r\n|[ \t\r\n\f])?
-E		e|\\0{0,4}(45|65)(\r\n|[ \t\r\n\f])?
-G		g|\\0{0,4}(47|67)(\r\n|[ \t\r\n\f])?|\\g
-H		h|\\0{0,4}(48|68)(\r\n|[ \t\r\n\f])?|\\h
-I		i|\\0{0,4}(49|69)(\r\n|[ \t\r\n\f])?|\\i
-K		k|\\0{0,4}(4b|6b)(\r\n|[ \t\r\n\f])?|\\k
+url             ([!#$%&*-~]|{nonascii}|{escape})*
+s               [ \t\r\n\f]+
+w               {s}?
+nl              \n|\r\n|\r|\f
+
+A               a|\\0{0,4}(41|61)(\r\n|[ \t\r\n\f])?
+C               c|\\0{0,4}(43|63)(\r\n|[ \t\r\n\f])?
+D               d|\\0{0,4}(44|64)(\r\n|[ \t\r\n\f])?
+E               e|\\0{0,4}(45|65)(\r\n|[ \t\r\n\f])?
+G               g|\\0{0,4}(47|67)(\r\n|[ \t\r\n\f])?|\\g
+H               h|\\0{0,4}(48|68)(\r\n|[ \t\r\n\f])?|\\h
+I               i|\\0{0,4}(49|69)(\r\n|[ \t\r\n\f])?|\\i
+K               k|\\0{0,4}(4b|6b)(\r\n|[ \t\r\n\f])?|\\k
 L               l|\\0{0,4}(4c|6c)(\r\n|[ \t\r\n\f])?|\\l
-M		m|\\0{0,4}(4d|6d)(\r\n|[ \t\r\n\f])?|\\m
-N		n|\\0{0,4}(4e|6e)(\r\n|[ \t\r\n\f])?|\\n
-O		o|\\0{0,4}(4f|6f)(\r\n|[ \t\r\n\f])?|\\o
-P		p|\\0{0,4}(50|70)(\r\n|[ \t\r\n\f])?|\\p
-R		r|\\0{0,4}(52|72)(\r\n|[ \t\r\n\f])?|\\r
-S		s|\\0{0,4}(53|73)(\r\n|[ \t\r\n\f])?|\\s
-T		t|\\0{0,4}(54|74)(\r\n|[ \t\r\n\f])?|\\t
+M               m|\\0{0,4}(4d|6d)(\r\n|[ \t\r\n\f])?|\\m
+N               n|\\0{0,4}(4e|6e)(\r\n|[ \t\r\n\f])?|\\n
+O               o|\\0{0,4}(4f|6f)(\r\n|[ \t\r\n\f])?|\\o
+P               p|\\0{0,4}(50|70)(\r\n|[ \t\r\n\f])?|\\p
+R               r|\\0{0,4}(52|72)(\r\n|[ \t\r\n\f])?|\\r
+S               s|\\0{0,4}(53|73)(\r\n|[ \t\r\n\f])?|\\s
+T               t|\\0{0,4}(54|74)(\r\n|[ \t\r\n\f])?|\\t
 U               u|\\0{0,4}(55|75)(\r\n|[ \t\r\n\f])?|\\u
-X		x|\\0{0,4}(58|78)(\r\n|[ \t\r\n\f])?|\\x
-Z		z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
+X               x|\\0{0,4}(58|78)(\r\n|[ \t\r\n\f])?|\\x
+Z               z|\\0{0,4}(5a|7a)(\r\n|[ \t\r\n\f])?|\\z
 
 %%
 
-{s}			{return S;}
+{s}                     {return S;}
 
-{comment}	{return COMMENT;}
-#\/\*[^*]*\*+([^/*][^*]*\*+)*\/		/* ignore comments */
-{badcomment}                         /* unclosed comment at EOF */
+{comment}               {return COMMENT;}
+#\/\*[^*]*\*+([^/*][^*]*\*+)*\/ /* ignore comments */
+{badcomment}                    /* unclosed comment at EOF */
 
-"<!--"		{return CDO;}
-"-->"			{return CDC;}
-"~="			{return INCLUDES;}
-"|="			{return DASHMATCH;}
+"<!--"                  {return CDO;}
+"-->"                   {return CDC;}
+"~="                    {return INCLUDES;}
+"|="                    {return DASHMATCH;}
 
-{string}		{return STRING;}
+{string}                {return STRING;}
 {badstring}             {return BAD_STRING;}
 
-{ident}			{return IDENT;}
-
-"#"{name}		{return HASH;}
-
-@{I}{M}{P}{O}{R}{T}	{return IMPORT_SYM;}
-@{P}{A}{G}{E}		{return PAGE_SYM;}
-@{M}{E}{D}{I}{A}	{return MEDIA_SYM;}
-"@charset "		{return CHARSET_SYM;}
-
-"!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}	{return IMPORTANT_SYM;}
-
-{num}{E}{M}		{return EMS;}
-{num}{E}{X}		{return EXS;}
-{num}{P}{X}		{return LENGTH;}
-{num}{C}{M}		{return LENGTH;}
-{num}{M}{M}		{return LENGTH;}
-{num}{I}{N}		{return LENGTH;}
-{num}{P}{T}		{return LENGTH;}
-{num}{P}{C}		{return LENGTH;}
-{num}{D}{E}{G}		{return ANGLE;}
-{num}{R}{A}{D}		{return ANGLE;}
-{num}{G}{R}{A}{D}	{return ANGLE;}
-{num}{M}{S}		{return TIME;}
-{num}{S}		{return TIME;}
-{num}{H}{Z}		{return FREQ;}
-{num}{K}{H}{Z}		{return FREQ;}
-{num}{ident}		{return DIMENSION;}
-
-{num}%			{return PERCENTAGE;}
-{num}			{return NUMBER;}
+{ident}                 {return IDENT;}
+
+"#"{name}               {return HASH;}
+
+@{I}{M}{P}{O}{R}{T}     {return IMPORT_SYM;}
+@{P}{A}{G}{E}           {return PAGE_SYM;}
+@{M}{E}{D}{I}{A}        {return MEDIA_SYM;}
+"@charset "             {return CHARSET_SYM;}
+
+"!"({w}|{comment})*{I}{M}{P}{O}{R}{T}{A}{N}{T}  {return IMPORTANT_SYM;}
+
+{num}{E}{M}             {return EMS;}
+{num}{E}{X}             {return EXS;}
+{num}{P}{X}             {return LENGTH;}
+{num}{C}{M}             {return LENGTH;}
+{num}{M}{M}             {return LENGTH;}
+{num}{I}{N}             {return LENGTH;}
+{num}{P}{T}             {return LENGTH;}
+{num}{P}{C}             {return LENGTH;}
+{num}{D}{E}{G}          {return ANGLE;}
+{num}{R}{A}{D}          {return ANGLE;}
+{num}{G}{R}{A}{D}       {return ANGLE;}
+{num}{M}{S}             {return TIME;}
+{num}{S}                {return TIME;}
+{num}{H}{Z}             {return FREQ;}
+{num}{K}{H}{Z}          {return FREQ;}
+{num}{ident}            {return DIMENSION;}
+
+{num}%                  {return PERCENTAGE;}
+{num}                   {return NUMBER;}
 
 "url("{w}{string}{w}")" {return URI;}
 "url("{w}{url}{w}")"    {return URI;}
 {baduri}                {return BAD_URI;}
 
-{ident}"("		{return FUNCTION;}
+{ident}"("              {return FUNCTION;}
 
-.			{return *yytext;}
+.                       {return *yytext;}
 
 %%
diff --git a/src/ftp-ls.c b/src/ftp-ls.c
index 7a18584f..634b06dc 100644
--- a/src/ftp-ls.c
+++ b/src/ftp-ls.c
@@ -857,7 +857,7 @@ ftp_parse_vms_ls (FILE *fp)
             {
               /* Date. */
               DEBUGP (("Date.\n"));
-				  snprintf(date_str, sizeof(date_str), "%s ", tok);
+              snprintf(date_str, sizeof(date_str), "%s ", tok);
             }
           else if ((strlen (tok) < 12) && (strchr( tok, ':') != NULL))
             {
@@ -967,7 +967,7 @@ ftp_parse_vms_ls (FILE *fp)
       else
         {
           cur.prev = l;
-			 cur.next = NULL;
+          cur.next = NULL;
           l->next = xmalloc (sizeof (struct fileinfo));
           l = l->next;
           memcpy (l, &cur, sizeof (cur));
diff --git a/src/http.c b/src/http.c
index 8c1bbf52..383a647e 100644
--- a/src/http.c
+++ b/src/http.c
@@ -4385,7 +4385,7 @@ http_loop (struct url *u, struct url *original_url, char **newloc,
 
       if (opt.spider && !got_head)
         logprintf (LOG_VERBOSE,
-			  _("Spider mode enabled. Check if remote file exists.\n"));
+        _("Spider mode enabled. Check if remote file exists.\n"));
 
       /* Print fetch message, if opt.verbose.  */
 #ifdef WINDOWS
diff --git a/src/metalink.h b/src/metalink.h
index bd8b99c9..2d5b1771 100644
--- a/src/metalink.h
+++ b/src/metalink.h
@@ -27,7 +27,7 @@ Corresponding Source for a non-source form of such a combination
 shall include the source code for the parts of OpenSSL used as well
 as that of the covered work.  */
 #if ! defined METALINK_H && defined HAVE_METALINK
-#define	METALINK_H
+#define METALINK_H
 
 #include <metalink/metalink_types.h>
 #include "dirname.h"
@@ -72,4 +72,4 @@ const char *find_key_values (const char *start,
                              char **key,
                              char **value);
 
-#endif	/* METALINK_H */
+#endif  /* METALINK_H */
diff --git a/src/netrc.c b/src/netrc.c
index 285f595c..859ad37f 100644
--- a/src/netrc.c
+++ b/src/netrc.c
@@ -402,10 +402,10 @@ parse_netrc_fp (const char *path, FILE *fp)
               else if (!strcmp (tok, "password") || !strcmp (tok, "passwd"))
                 last_token = tok_password;
 
-				  /* GNU extensions 'port' and 'force', not operational
-					* see https://www.gnu.org/software/emacs/manual/html_node/gnus/NNTP.html#index-nntp_002dauthinfo_002dfunction-2003
-					* see https://savannah.gnu.org/bugs/index.php?52066
-					*/
+              /* GNU extensions 'port' and 'force', not operational
+              * see https://www.gnu.org/software/emacs/manual/html_node/gnus/NNTP.html#index-nntp_002dauthinfo_002dfunction-2003
+              * see https://savannah.gnu.org/bugs/index.php?52066
+              */
               else if (!strcmp (tok, "port"))
                 last_token = tok_port;
 
diff --git a/src/openssl.c b/src/openssl.c
index f6d392f4..a7879aa8 100644
--- a/src/openssl.c
+++ b/src/openssl.c
@@ -324,9 +324,9 @@ ssl_init (void)
   if (!opt.tls_ciphers_string)
     {
       if (opt.secure_protocol == secure_protocol_auto)
-	      ciphers_string = "HIGH:!aNULL:!RC4:!MD5:!SRP:!PSK";
+        ciphers_string = "HIGH:!aNULL:!RC4:!MD5:!SRP:!PSK";
       else if (opt.secure_protocol == secure_protocol_pfs)
-	      ciphers_string = "HIGH:!aNULL:!RC4:!MD5:!SRP:!PSK:!kRSA";
+        ciphers_string = "HIGH:!aNULL:!RC4:!MD5:!SRP:!PSK:!kRSA";
     }
   else
     {
@@ -879,7 +879,7 @@ ssl_connect_wget (int fd, const char *hostname, int *continue_session)
   if (init_prng () != 1)
     {
       logprintf(LOG_NOTQUIET,
-		_("WARNING: Could not seed PRNG. Consider using --random-file.\n"));
+      _("WARNING: Could not seed PRNG. Consider using --random-file.\n"));
       goto error;
     }
 
diff --git a/src/res.c b/src/res.c
index e48aa25d..d82e8845 100644
--- a/src/res.c
+++ b/src/res.c
@@ -170,8 +170,8 @@ prune_non_exact (struct robot_specs *specs)
   for (i = 0, j = 0; i < specs->count; i++)
     if (specs->paths[i].user_agent_exact_p)
       newpaths[j++] = specs->paths[i];
-	 else
-		 xfree (specs->paths[i].path);
+    else
+      xfree (specs->paths[i].path);
   assert (j == cnt);
   xfree (specs->paths);
   specs->paths = newpaths;
diff --git a/src/retr.c b/src/retr.c
index 6658b9d6..6c621b81 100644
--- a/src/retr.c
+++ b/src/retr.c
@@ -832,7 +832,7 @@ calc_rate (wgint bytes, double secs, int *units)
   else {
     *units = 4, dlrate /= (bibyte * bibyte * bibyte * bibyte);
     if (dlrate > 99.99)
-		 dlrate = 99.99; // upper limit 99.99TB/s
+      dlrate = 99.99; // upper limit 99.99TB/s
   }
 
   return dlrate;
diff --git a/src/utils.c b/src/utils.c
index fd8a6ffb..9861e850 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -565,7 +565,7 @@ file_exists_p (const char *filename, file_stats_t *fstats)
   struct stat buf;
 
   if (!filename)
-	  return false;
+    return false;
 
 #if defined(WINDOWS) || defined(__VMS)
     int ret = stat (filename, &buf);
@@ -976,7 +976,7 @@ make_directory (const char *directory)
     {
       memcpy(buf, directory, len + 1);
       dir = buf;
-	}
+    }
   else
     dir = xstrdup(directory);
 
@@ -1003,7 +1003,7 @@ make_directory (const char *directory)
     }
 
   if (dir != buf)
-	  xfree (dir);
+    xfree (dir);
 
   return ret;
 }
@@ -2534,7 +2534,7 @@ match_pcre2_regex (const void *regex, const char *str)
       pcre2_match_data_free(match_data);
     }
   else
-	  rc = PCRE2_ERROR_NOMEMORY;
+    rc = PCRE2_ERROR_NOMEMORY;
 
   if (rc < 0 && rc != PCRE2_ERROR_NOMATCH)
     {
diff --git a/src/warc.c b/src/warc.c
index 99113b9e..e074cfb3 100644
--- a/src/warc.c
+++ b/src/warc.c
@@ -703,20 +703,20 @@ windows_uuid_str (char *urn_str, size_t urn_size)
       HMODULE hm_rpcrt4 = LoadLibrary ("Rpcrt4.dll");
 
       if (hm_rpcrt4)
-	{
-	  pfn_UuidCreate =
-	    (UuidCreate_proc) GetProcAddress (hm_rpcrt4, "UuidCreate");
-	  pfn_UuidToString =
-	    (UuidToString_proc) GetProcAddress (hm_rpcrt4, "UuidToStringA");
-	  pfn_RpcStringFree =
-	    (RpcStringFree_proc) GetProcAddress (hm_rpcrt4, "RpcStringFreeA");
-	  if (pfn_UuidCreate && pfn_UuidToString && pfn_RpcStringFree)
-	    rpc_uuid_avail = 1;
-	  else
-	    rpc_uuid_avail = 0;
-	}
+      {
+        pfn_UuidCreate =
+          (UuidCreate_proc) GetProcAddress (hm_rpcrt4, "UuidCreate");
+        pfn_UuidToString =
+          (UuidToString_proc) GetProcAddress (hm_rpcrt4, "UuidToStringA");
+        pfn_RpcStringFree =
+          (RpcStringFree_proc) GetProcAddress (hm_rpcrt4, "RpcStringFreeA");
+        if (pfn_UuidCreate && pfn_UuidToString && pfn_RpcStringFree)
+          rpc_uuid_avail = 1;
+        else
+          rpc_uuid_avail = 0;
+      }
       else
-	rpc_uuid_avail = 0;
+        rpc_uuid_avail = 0;
     }
 
   if (rpc_uuid_avail)
@@ -725,14 +725,14 @@ windows_uuid_str (char *urn_str, size_t urn_size)
       UUID  uuid;
 
       if (pfn_UuidCreate (&uuid) == RPC_S_OK)
-	{
-	  if (pfn_UuidToString (&uuid, &uuid_str) == RPC_S_OK)
-	    {
-	      snprintf (urn_str, urn_size, "<urn:uuid:%s>", uuid_str);
-	      pfn_RpcStringFree (&uuid_str);
-	      return 1;
-	    }
-	}
+      {
+        if (pfn_UuidToString (&uuid, &uuid_str) == RPC_S_OK)
+          {
+            snprintf (urn_str, urn_size, "<urn:uuid:%s>", uuid_str);
+            pfn_RpcStringFree (&uuid_str);
+            return 1;
+          }
+      }
     }
   return 0;
 }
@@ -764,11 +764,11 @@ warc_uuid_str (char *urn_str, size_t urn_size)
     uuid_data[i] = random_number (255);
 
   /* Set the four most significant bits (bits 12 through 15) of the
-	*  time_hi_and_version field to the 4-bit version number */
+  *  time_hi_and_version field to the 4-bit version number */
   uuid_data[6] = (uuid_data[6] & 0x0F) | 0x40;
 
   /* Set the two most significant bits (bits 6 and 7) of the
-	*  clock_seq_hi_and_reserved to zero and one, respectively. */
+  *  clock_seq_hi_and_reserved to zero and one, respectively. */
   uuid_data[8] = (uuid_data[8] & 0xBF) | 0x80;
 
   snprintf (urn_str, urn_size,
diff --git a/src/wget.h b/src/wget.h
index c62ef9e0..4b655d35 100644
--- a/src/wget.h
+++ b/src/wget.h
@@ -181,7 +181,7 @@ typedef int64_t wgint;
    otherwise, the result is undefined.  */
 static inline unsigned char _unhex(unsigned char c)
 {
-	return c <= '9' ? c - '0' : (c <= 'F' ? c - 'A' + 10 : c - 'a' + 10);
+   return c <= '9' ? c - '0' : (c <= 'F' ? c - 'A' + 10 : c - 'a' + 10);
 }
 #define X2DIGITS_TO_NUM(h1, h2) ((_unhex (h1) << 4) + _unhex (h2))
 
diff --git a/src/xattr.c b/src/xattr.c
index 0a7ff824..44189a23 100644
--- a/src/xattr.c
+++ b/src/xattr.c
@@ -79,9 +79,9 @@ set_file_metadata (const struct url *origin_url, const struct url *referrer_url,
 
   if (!retval && referrer_url)
     {
-	  struct url u;
+      struct url u;
 
-	  memset(&u, 0, sizeof(u));
+      memset(&u, 0, sizeof(u));
       u.scheme = referrer_url->scheme;
       u.host = referrer_url->host;
       u.port = referrer_url->port;
diff --git a/tests/Test-cookies.px b/tests/Test-cookies.px
index 99fda8f7..251f5b41 100755
--- a/tests/Test-cookies.px
+++ b/tests/Test-cookies.px
@@ -76,7 +76,7 @@ my %urls = (
 my $cmdline = $WgetTest::WGETPATH . " http://localhost:{{port}}/one.txt"
     . " http://localhost:{{port}}/two.txt" . " http://localhost:{{port}}/three.txt"
     . " http://localhost:{{port}}/four.txt" . " http://localhost:{{port}}/five.txt"
-	 . " http://localhost:{{port}}/six.txt";
+    . " http://localhost:{{port}}/six.txt";
 
 my $expected_error_code = 0;
 
diff --git a/tests/Test-iri-disabled.px b/tests/Test-iri-disabled.px
index b7b06f4b..f45da83e 100755
--- a/tests/Test-iri-disabled.px
+++ b/tests/Test-iri-disabled.px
@@ -116,7 +116,7 @@ my %urls = (
         },
         content => "",
     },
-    '/p1_fran%C3%A7ais.html' => {	# UTF-8 encoded
+    '/p1_fran%C3%A7ais.html' => {   # UTF-8 encoded
         code => "200",
         msg => "File not found",
         headers => {
@@ -132,7 +132,7 @@ my %urls = (
         },
         content => $pagefrancais,
     },
-    '/p2_%C3%A9%C3%A9n.html' => {	# UTF-8 encoded
+    '/p2_%C3%A9%C3%A9n.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
@@ -148,7 +148,7 @@ my %urls = (
         },
         content => $pageeen,
     },
-    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => {	# UTF-8 encoded
+    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => { # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
diff --git a/tests/Test-iri-forced-remote.px b/tests/Test-iri-forced-remote.px
index 8bcf5871..ce0f5e3c 100755
--- a/tests/Test-iri-forced-remote.px
+++ b/tests/Test-iri-forced-remote.px
@@ -118,7 +118,7 @@ my %urls = (
         },
         content => "",
     },
-    '/p1_fran%C3%A7ais.html' => {	# UTF-8 encoded
+    '/p1_fran%C3%A7ais.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
@@ -127,7 +127,7 @@ my %urls = (
         },
         content => $pagefrancais,
     },
-    '/p2_%C3%A9%C3%A9n.html' => {	# UTF-8 encoded
+    '/p2_%C3%A9%C3%A9n.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
@@ -135,7 +135,7 @@ my %urls = (
         },
         content => $pageeen,
     },
-    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => {	# UTF-8 encoded
+    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => { # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
@@ -143,7 +143,7 @@ my %urls = (
         },
         content => $pageeuro,
     },
-    '/p3_%C2%A4%C2%A4%C2%A4.html' => {	# UTF-8 encoded
+    '/p3_%C2%A4%C2%A4%C2%A4.html' => {  # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
diff --git a/tests/Test-iri-list.px b/tests/Test-iri-list.px
index e1849134..87243286 100755
--- a/tests/Test-iri-list.px
+++ b/tests/Test-iri-list.px
@@ -40,7 +40,7 @@ my $pageindex = <<EOF;
 </head>
 <body>
   <p>
-	Main page.
+    Main page.
   </p>
 </body>
 </html>
@@ -105,7 +105,7 @@ my %urls = (
         },
         content => "",
     },
-    '/p1_fran%C3%A7ais.html' => {	# UTF-8 encoded
+    '/p1_fran%C3%A7ais.html' => {   # UTF-8 encoded
         code => "404",
         msg => "File not found",
         headers => {
@@ -121,7 +121,7 @@ my %urls = (
         },
         content => $pagefrancais,
     },
-    '/p2_%C3%A9%C3%A9n.html' => {	# UTF-8 encoded
+    '/p2_%C3%A9%C3%A9n.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
diff --git a/tests/Test-iri.px b/tests/Test-iri.px
index 915fb858..c84cd8fa 100755
--- a/tests/Test-iri.px
+++ b/tests/Test-iri.px
@@ -135,7 +135,7 @@ my %urls = (
         },
         content => "",
     },
-    '/p1_fran%C3%A7ais.html' => {	# UTF-8 encoded
+    '/p1_fran%C3%A7ais.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {
@@ -144,7 +144,7 @@ my %urls = (
         },
         content => $pagefrancais,
     },
-    '/p2_%C3%A9%C3%A9n.html' => {	# UTF-8 encoded
+    '/p2_%C3%A9%C3%A9n.html' => {   # UTF-8 encoded
         code => "200",
         msg => "Ok",
         request_headers => {
@@ -155,7 +155,7 @@ my %urls = (
         },
         content => $pageeen,
     },
-    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => {	# UTF-8 encoded
+    '/p3_%E2%82%AC%E2%82%AC%E2%82%AC.html' => { # UTF-8 encoded
         code => "200",
         msg => "Ok",
         headers => {