diff --git a/bootstrap.conf b/bootstrap.conf
index f75d69ac..6f0f0c3c 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -444,7 +444,7 @@ libtool_require_package_url ()
     $require_configure_ac
 
     func_extract_trace AC_INIT
-    
+
     save_IFS="$IFS"
     IFS=:
     set dummy $func_extract_trace_result
diff --git a/cfg.mk b/cfg.mk
index 726f7513..a31f7932 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -41,8 +41,7 @@ local-checks-to-fix =				\
 	sc_prohibit_always-defined_macros	\
 	sc_prohibit_always_true_header_tests	\
 	sc_require_config_h			\
-	sc_require_config_h_first		\
-	sc_trailing_blank
+	sc_require_config_h_first
 
 local-checks-to-skip =				\
 	$(local-checks-to-fix)			\
@@ -50,6 +49,7 @@ local-checks-to-skip =				\
 	sc_bindtextdomain			\
 	sc_cast_of_x_alloc_return_value		\
 	sc_program_name				\
+	sc_trailing_blank			\
 	sc_unmarked_diagnostics
 
 # GPL_version: checks for GPLv3, which we don't use
@@ -57,8 +57,14 @@ local-checks-to-skip =				\
 # cast_of_x_alloc_return_value:
 #         We support C++ compilation which does require casting here.
 # program_name: libtool has no programs!
+# trailing_blank: flags valid rfc3676 separators
 # unmarked_diagnostics: libtool isn't internationalized
 
+sc_trailing_blank-non-rfc3676:
+	@prohibit='([^-][^-][	 ][	 ]*|^[	 ][	 ]*)$$'		\
+	halt='found trailing blank(s)'					\
+	  $(_sc_search_regexp)
+
 # List syntax-check exempted files.
 exclude_file_name_regexp--sc_error_message_uppercase = \
   ^$(_build-aux)/cvsu$$
@@ -67,3 +73,4 @@ exclude_file_name_regexp--sc_prohibit_strcmp = \
 exclude_file_name_regexp--sc_prohibit_test_minus_ao = \
   ^m4/libtool.m4$$
 exclude_file_name_regexp--sc_space_tab = \.diff$$
+exclude_file_name_regexp--sc_trailing_blank-non-rfc3676 = \.diff$$
diff --git a/doc/PLATFORMS b/doc/PLATFORMS
index a7241447..eb8ee73a 100644
--- a/doc/PLATFORMS
+++ b/doc/PLATFORMS
@@ -110,7 +110,7 @@ mips-sgi-irix5.2                cc       1.3b     ok
 mips-sni-sysv4			cc       1.3.5    ok
   (Siemens C-compiler)
 mips-sni-sysv4			gcc      1.3.5    ok
-  (gcc-2.7.2.3, GNU assembler 2.8.1, native ld) 
+  (gcc-2.7.2.3, GNU assembler 2.8.1, native ld)
 mipsel-unknown-openbsd2.1       gcc      1.0      ok
 powerpc-apple-darwin6.4         gcc      1.5      ok
 (apple dev tools released 12/2002)
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index e3374618..be449732 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -1409,7 +1409,7 @@ func_require_ac_ltdl_mode ()
       *" recursive "*)    ac_ltdl_mode=recursive    ;;
       *" subproject "*)   ac_ltdl_mode=subproject   ;;
     esac
-      
+
     require_ac_ltdl_mode=:
 }
 
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index a3ac26db..a9e20cfe 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1195,7 +1195,7 @@ fi
 # Invoke $ECHO with all args, space-separated.
 func_echo_all ()
 {
-    $ECHO "$*" 
+    $ECHO "$*"
 }
 
 case "$ECHO" in
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da90..ffeab568 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -25,7 +25,7 @@
 # included after everything else.  This provides aclocal with the
 # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
 # because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
 #
 # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
 # Yes, that means every name once taken will need to remain here until
diff --git a/tests/archive-in-archive.at b/tests/archive-in-archive.at
index fd67c7d4..5cd6d77e 100644
--- a/tests/archive-in-archive.at
+++ b/tests/archive-in-archive.at
@@ -44,7 +44,7 @@ $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o foo.lo foo.c
 $LIBTOOL --mode=compile --tag=CC $CC $CPPFLAGS $CFLAGS -c -o bar.lo bar.c
 $LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
 -o libfoo.la foo.lo -version-info 1:0:0 -rpath $thisdir
-$LIBTOOL --mode=install cp libfoo.la $thisdir 
+$LIBTOOL --mode=install cp libfoo.la $thisdir
 eval `$EGREP '^(old_library)=' < libfoo.la`
 libfoo=$old_library
 AT_CHECK([$LIBTOOL --mode=link --tag=CC --tag=disable-shared $CC $CFLAGS $LDFLAGS \
diff --git a/tests/convenience.at b/tests/convenience.at
index f076e61a..0f6a0e22 100644
--- a/tests/convenience.at
+++ b/tests/convenience.at
@@ -43,7 +43,7 @@ cat >main3.c <<EOF
 extern int a1(void), a2(void), a3(void);
 int main(void) { return a1() + a2() + a3() != 6; }
 EOF
-for i in 1 2 3; do 
+for i in 1 2 3; do
   echo "int a$i(void) { return $i; }" > a$i.c
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c main$i.c
   $LIBTOOL --mode=compile $CC $CPPFLAGS $CFLAGS -c a$i.c
@@ -83,7 +83,7 @@ cat >main3.cpp <<EOF
 extern int a1(void), a2(void), a3(void);
 int main(void) { return a1() + a2() + a3() != 6; }
 EOF
-for i in 1 2 3; do 
+for i in 1 2 3; do
   echo "int a$i(void) { return $i; }" > a$i.cpp
   $LIBTOOL --tag=CXX --mode=compile $CXX $CXXFLAGS -c main$i.cpp
   $LIBTOOL --tag=CXX --mode=compile $CXX $CXXFLAGS -c a$i.cpp
@@ -136,7 +136,7 @@ cat >main3.f <<EOF
       end
 EOF
 
-for i in 1 2 3; do 
+for i in 1 2 3; do
   cat >a$i.f <<EOF
       subroutine a$i(res)
       implicit none
@@ -196,7 +196,7 @@ cat >main3.f <<EOF
       end
 EOF
 
-for i in 1 2 3; do 
+for i in 1 2 3; do
   cat >a$i.f <<EOF
       subroutine a$i(res)
       implicit none
diff --git a/tests/darwin.at b/tests/darwin.at
index b255abe4..6eab4cdb 100644
--- a/tests/darwin.at
+++ b/tests/darwin.at
@@ -36,7 +36,7 @@ int main() { return 0;}
 
 $noskip && {
 $CC $CPPFLAGS $CFLAGS -arch ppc -arch i386 -o simple simple.c 2>&1 > /dev/null || noskip=false
-rm -f simple 
+rm -f simple
 }
 
 AT_CHECK([$noskip || (exit 77)])
diff --git a/tests/depdemo/l1/l1.c b/tests/depdemo/l1/l1.c
index d7c6c1ee..715a91e9 100644
--- a/tests/depdemo/l1/l1.c
+++ b/tests/depdemo/l1/l1.c
@@ -37,5 +37,5 @@ func_l1 (int indent)
     putchar(' ');
   printf("l1 (%i)\n", var_l1);
   var_l1++;
-  return 0; 
+  return 0;
 }
diff --git a/tests/depdemo/l2/l2.c b/tests/depdemo/l2/l2.c
index b545332a..76b7e605 100644
--- a/tests/depdemo/l2/l2.c
+++ b/tests/depdemo/l2/l2.c
@@ -40,5 +40,5 @@ func_l2 (int indent)
   printf("l2 (%i)\n", var_l2);
   func_l1(indent+1);
   var_l2 += var_l1;
-  return 0; 
+  return 0;
 }
diff --git a/tests/depdemo/l3/l3.c b/tests/depdemo/l3/l3.c
index 60569075..33910e62 100644
--- a/tests/depdemo/l3/l3.c
+++ b/tests/depdemo/l3/l3.c
@@ -42,5 +42,5 @@ func_l3 (int indent)
   func_l1(indent+1);
   func_l2(indent+1);
   var_l3 += var_l1 + var_l2;
-  return 0; 
+  return 0;
 }
diff --git a/tests/depdemo/l4/l4.c b/tests/depdemo/l4/l4.c
index 068a0d92..0ff2e33a 100644
--- a/tests/depdemo/l4/l4.c
+++ b/tests/depdemo/l4/l4.c
@@ -44,5 +44,5 @@ func_l4 (int indent)
     putchar(' ');
   printf("libm [sin(1.5) = %f]\n", sin(1.5));
   var_l4 += var_l3;
-  return 0; 
+  return 0;
 }
diff --git a/tests/f77demo/README b/tests/f77demo/README
index 1417e729..e23e69bb 100644
--- a/tests/f77demo/README
+++ b/tests/f77demo/README
@@ -1,12 +1,12 @@
 This is a short demo of the fortran support in libtool.
 
-fprogram is a pure-fortran program which is linked 
+fprogram is a pure-fortran program which is linked
 against the fortran-only library libfoo.la
 
 cprogram is a C program, which is linked against the
 mixed C and fortran library libmix.la. The program
-calls a C function, which in turn calls a fortran 
+calls a C function, which in turn calls a fortran
 function.
 
-This demo requires GNU autoconf, automake, 
+This demo requires GNU autoconf, automake,
 libtool with the F77 tag and quite obvious Fortran 77.
diff --git a/tests/f77demo/cprogram.c b/tests/f77demo/cprogram.c
index 3275fd58..1089e8c3 100644
--- a/tests/f77demo/cprogram.c
+++ b/tests/f77demo/cprogram.c
@@ -28,26 +28,26 @@ int
 main ()
 {
   int arg,cres,fres;
-  
+
   printf ("Welcome to GNU libtool mixed C/Fortran demo!\n");
-  
+
   arg=2;
-  
+
   cres=csub(arg);
-  
+
   printf ("The C subroutine returned, claiming that 2*%d = %d\n",arg,cres);
-  
+
   if(cres==2*arg)
     printf ("The C subroutine is ok!\n");
-  
+
   printf("\nCalling the C wrapper routine...\n");
   fres=fwrapper(arg);
-  
+
   printf ("The C wrapper to the fortran subroutine returned,\n"
 	  "claiming that 2*%d = %d\n",arg,fres);
-  
+
   if(fres==2*arg)
     printf ("The Fortran 77 subroutine is ok!\n");
-  
+
   return 0;
 }
diff --git a/tests/f77demo/foof.f b/tests/f77demo/foof.f
index f899c494..6f6c6f63 100644
--- a/tests/f77demo/foof.f
+++ b/tests/f77demo/foof.f
@@ -1,9 +1,7 @@
-C 
 C This program is free software; you can redistribute it and/or
 C modify it under the terms of the GNU General Public License
 C as published by the Free Software Foundation; either version 2
 C of the License, or (at your option) any later version.
-C 
 
       subroutine fsub(arg,res)
       write(*,*) 'fsub called'
diff --git a/tests/f77demo/foof2.f b/tests/f77demo/foof2.f
index e1f15506..f7e2fe43 100644
--- a/tests/f77demo/foof2.f
+++ b/tests/f77demo/foof2.f
@@ -1,9 +1,7 @@
-C 
 C This program is free software; you can redistribute it and/or
 C modify it under the terms of the GNU General Public License
 C as published by the Free Software Foundation; either version 2
 C of the License, or (at your option) any later version.
-C 
 
       subroutine fsubf(arg,res)
       implicit none
diff --git a/tests/f77demo/foof3.f b/tests/f77demo/foof3.f
index 6d88204d..8b7307fc 100644
--- a/tests/f77demo/foof3.f
+++ b/tests/f77demo/foof3.f
@@ -1,9 +1,7 @@
-C 
 C This program is free software; you can redistribute it and/or
 C modify it under the terms of the GNU General Public License
 C as published by the Free Software Foundation; either version 2
 C of the License, or (at your option) any later version.
-C 
 
       subroutine fsub3(arg,res)
       implicit none
diff --git a/tests/f77demo/fprogram.f b/tests/f77demo/fprogram.f
index faf56a63..6fcdb752 100644
--- a/tests/f77demo/fprogram.f
+++ b/tests/f77demo/fprogram.f
@@ -1,9 +1,7 @@
-C 
 C This program is free software; you can redistribute it and/or
 C modify it under the terms of the GNU General Public License
 C as published by the Free Software Foundation; either version 2
 C of the License, or (at your option) any later version.
-C 
 
       program fprogram
       implicit none
diff --git a/tests/fcdemo/README b/tests/fcdemo/README
index 44214a08..c18cc977 100644
--- a/tests/fcdemo/README
+++ b/tests/fcdemo/README
@@ -1,12 +1,12 @@
 This is a short demo of the fortran support in libtool.
 
-fprogram is a pure-fortran program which is linked 
+fprogram is a pure-fortran program which is linked
 against the fortran-only library libfoo.la
 
 cprogram is a C program, which is linked against the
 mixed C and fortran library libmix.la. The program
-calls a C function, which in turn calls a fortran 
+calls a C function, which in turn calls a fortran
 function.
 
-This demo requires GNU autoconf, automake, 
+This demo requires GNU autoconf, automake,
 libtool with the FC tag and quite obvious Fortran.
diff --git a/tests/fcdemo/cprogram.c b/tests/fcdemo/cprogram.c
index b0bdf123..e7818e0a 100644
--- a/tests/fcdemo/cprogram.c
+++ b/tests/fcdemo/cprogram.c
@@ -29,26 +29,26 @@ int
 main ()
 {
   int arg,cres,fres;
-  
+
   printf ("Welcome to GNU libtool mixed C/Fortran demo!\n");
-  
+
   arg = 2;
-  
+
   cres = csub (arg);
-  
+
   printf ("The C subroutine returned, claiming that 2*%d = %d\n",arg,cres);
-  
+
   if (cres == 2*arg)
     printf ("The C subroutine is ok!\n");
-  
+
   printf ("\nCalling the C wrapper routine...\n");
   fres = fwrapper (arg);
-  
+
   printf ("The C wrapper to the fortran subroutine returned,\n"
 	  "claiming that 2*%d = %d\n",arg,fres);
-  
+
   if (fres == 2*arg)
     printf ("The Fortran subroutine is ok!\n");
-  
+
   return 0;
 }
diff --git a/tests/fcdemo/foof.f90 b/tests/fcdemo/foof.f90
index 794dde97..7877f217 100644
--- a/tests/fcdemo/foof.f90
+++ b/tests/fcdemo/foof.f90
@@ -1,9 +1,8 @@
-! 
 ! This program is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU General Public License
 ! as published by the Free Software Foundation; either version 2
 ! of the License, or (at your option) any later version.
-! 
+
 subroutine fsub(arg,res)
   write(*,*) 'fsub called'
   call fsubf(arg,res)
diff --git a/tests/fcdemo/foof2.f90 b/tests/fcdemo/foof2.f90
index 913868b1..9917ee7f 100644
--- a/tests/fcdemo/foof2.f90
+++ b/tests/fcdemo/foof2.f90
@@ -1,9 +1,8 @@
-! 
 ! This program is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU General Public License
 ! as published by the Free Software Foundation; either version 2
 ! of the License, or (at your option) any later version.
-! 
+
 subroutine fsubf(arg,res)
   implicit none
   integer arg,res
diff --git a/tests/fcdemo/foof3.f90 b/tests/fcdemo/foof3.f90
index 922751b1..5de3c841 100644
--- a/tests/fcdemo/foof3.f90
+++ b/tests/fcdemo/foof3.f90
@@ -1,9 +1,8 @@
-! 
 ! This program is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU General Public License
 ! as published by the Free Software Foundation; either version 2
 ! of the License, or (at your option) any later version.
-! 
+
 subroutine fsub3(arg,res)
   implicit none
   integer arg,res
diff --git a/tests/fcdemo/fprogram.f90 b/tests/fcdemo/fprogram.f90
index dca35b82..4fa15005 100644
--- a/tests/fcdemo/fprogram.f90
+++ b/tests/fcdemo/fprogram.f90
@@ -1,9 +1,8 @@
-! 
 ! This program is free software; you can redistribute it and/or
 ! modify it under the terms of the GNU General Public License
 ! as published by the Free Software Foundation; either version 2
 ! of the License, or (at your option) any later version.
-! 
+
 program fprogram
   implicit none
   integer arg,res
diff --git a/tests/mdemo/README b/tests/mdemo/README
index a599ff21..aa4cebb8 100644
--- a/tests/mdemo/README
+++ b/tests/mdemo/README
@@ -1,10 +1,10 @@
 This is mdemo, an example package that uses GNU libtool with an
-Automake-generated environment to build two simple modules and 
+Automake-generated environment to build two simple modules and
 a program.
 
 It demonstrates how to build both dynamic and static libraries
 that can be dlopened. mdemo uses libtool's portable dlopen
-wrapper called "libltdl". 
+wrapper called "libltdl".
 All exported symbols are prefixed with "libname_LTX_" to avoid
 symbols conflicts, especially when linking statically.
 libltdl will automatically cut the prefix off to get the real name.
diff --git a/tests/mdemo/main.c b/tests/mdemo/main.c
index 3a95664e..ea732a9e 100644
--- a/tests/mdemo/main.c
+++ b/tests/mdemo/main.c
@@ -34,7 +34,7 @@ LT_END_C_DECLS
 int
 test_dl (char *filename, int test_ext)
 {
-  lt_dlhandle handle;	
+  lt_dlhandle handle;
   const lt_dlinfo *info;
   int (*pfoo1)() = 0;
   int (*pfoo2)() = 0;
@@ -65,12 +65,12 @@ test_dl (char *filename, int test_ext)
   }
   printf ("module filename: %s\n", info->filename);
   printf ("module reference count: %i\n", info->ref_count);
-  
-  phello = (int(*)())lt_dlsym(handle, "hello");  
+
+  phello = (int(*)())lt_dlsym(handle, "hello");
   if (phello)
     {
       int value = (*phello) ();
-      
+
       printf ("hello returned: %i\n", value);
       if (value == HELLO_RET)
         printf("hello is ok!\n");
@@ -82,7 +82,7 @@ test_dl (char *filename, int test_ext)
       ret = 1;
     }
 
-  pnothing = (int*)lt_dlsym(handle, "nothing");  
+  pnothing = (int*)lt_dlsym(handle, "nothing");
   /* Try assigning to the nothing variable. */
   if (pnothing)
     *pnothing = 1;
@@ -93,7 +93,7 @@ test_dl (char *filename, int test_ext)
       ret = 1;
     }
 
-  pfoo1 = (int(*)())lt_dlsym(handle, "foo1");  
+  pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
   /* Just call the functions and check return values. */
   if (pfoo1)
     {
@@ -103,7 +103,7 @@ test_dl (char *filename, int test_ext)
 	ret = 1;
     }
   else {
-    pfoo2 = (int(*)())lt_dlsym(handle, "foo2");  
+    pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
     if (pfoo2)
       {
         if ((*pfoo2) () == FOO_RET)
@@ -132,7 +132,7 @@ int myvar;
 int
 test_dlself ()
 {
-  lt_dlhandle handle;	
+  lt_dlhandle handle;
   int (*pmyfunc)() = 0;
   int *pmyvar = 0;
   int ret = 0;
@@ -148,7 +148,7 @@ test_dlself ()
   if (pmyfunc)
     {
       int value = (*pmyfunc) ();
-      
+
       printf ("myfunc returned: %i\n", value);
       if (value == HELLO_RET)
         printf("myfunc is ok!\n");
@@ -160,7 +160,7 @@ test_dlself ()
       ret = 1;
     }
 
-  pmyvar = (int*)lt_dlsym(handle, "myvar");  
+  pmyvar = (int*)lt_dlsym(handle, "myvar");
   /* Try assigning to the variable. */
   if (pmyvar)
     *pmyvar = 1;
diff --git a/tests/mdemo/mlib.c b/tests/mdemo/mlib.c
index c16c35c4..38374a44 100644
--- a/tests/mdemo/mlib.c
+++ b/tests/mdemo/mlib.c
@@ -30,7 +30,7 @@ or obtained by writing to the Free Software Foundation, Inc.,
 int
 test_dl (char *filename)
 {
-  lt_dlhandle handle;	
+  lt_dlhandle handle;
   const lt_dlinfo *info;
   int (*pfoo1)() = 0;
   int (*pfoo2)() = 0;
@@ -57,12 +57,12 @@ test_dl (char *filename)
   }
   printf ("module filename: %s\n", info->filename);
   printf ("module reference count: %i\n", info->ref_count);
-  
-  phello = (int(*)())lt_dlsym(handle, "hello");  
+
+  phello = (int(*)())lt_dlsym(handle, "hello");
   if (phello)
     {
       int value = (*phello) ();
-      
+
       printf ("hello returned: %i\n", value);
       if (value == HELLO_RET)
         printf("hello is ok!\n");
@@ -74,7 +74,7 @@ test_dl (char *filename)
       ret = 1;
     }
 
-  pnothing = (int*)lt_dlsym(handle, "nothing");  
+  pnothing = (int*)lt_dlsym(handle, "nothing");
   /* Try assigning to the nothing variable. */
   if (pnothing)
     *pnothing = 1;
@@ -85,7 +85,7 @@ test_dl (char *filename)
       ret = 1;
     }
 
-  pfoo1 = (int(*)())lt_dlsym(handle, "foo1");  
+  pfoo1 = (int(*)())lt_dlsym(handle, "foo1");
   /* Just call the functions and check return values. */
   if (pfoo1)
     {
@@ -95,7 +95,7 @@ test_dl (char *filename)
 	ret = 1;
     }
   else {
-    pfoo2 = (int(*)())lt_dlsym(handle, "foo2");  
+    pfoo2 = (int(*)())lt_dlsym(handle, "foo2");
     if (pfoo2)
       {
         if ((*pfoo2) () == FOO_RET)
@@ -113,7 +113,7 @@ test_dl (char *filename)
   return ret;
 }
 
-int 
+int
 mlib_func (int argc, char **argv)
 {
   int ret = 0;
diff --git a/tests/objectlist.test b/tests/objectlist.test
index 05063401..0eec0f31 100755
--- a/tests/objectlist.test
+++ b/tests/objectlist.test
@@ -43,6 +43,6 @@ rm -f "$objlist"
 echo "$linkresult" | ${EGREP} "spaces" >/dev/null 2>&1 && {
   func_msg "$progname: -objectlist with spaces in filename not recognized."
   exit $EXIT_FAILURE
-} 
+}
 
 exit $EXIT_SUCCESS
diff --git a/tests/static.at b/tests/static.at
index 6072d772..5b779e67 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -37,9 +37,9 @@
 #     will only cause the linker not to consider `*.so' libraries, but only
 #     `*.a'.  The latter, however, may still be shared images.  :-/
 #     `-all-static' still works, however.
-#   
+#
 #     It will not work with dlpreloading until we fix its related bug.
-#   
+#
 #   Let's try the latter until we know better.
 
 # - Test -Bstatic/-Bdynamic.  It should work with all of:
@@ -248,7 +248,7 @@ for withdep in no yes; do
   $LIBTOOL --mode=install cp a1/liba1.la $libdir1/liba1.la
   $LIBTOOL --mode=install cp a3/liba3.la $libdir3/liba3.la
   $LIBTOOL --mode=clean rm -f a1/liba1.la a3/liba3.la
-  test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la 
+  test "$withdep" = yes && $LIBTOOL --mode=clean rm -f a1/liba1dep.la
   # simulate a non-libtool lib:
   rm -f $libdir3/liba3.la
 
@@ -307,7 +307,7 @@ for withdep in no yes; do
 
   ### install the programs.
   # We can't install any program that links dynamically against liba2.
-  for st in -static -static-libtool-libs $can_link_all_static `$per_deplib && echo 2 12 23 123 123a`; do 
+  for st in -static -static-libtool-libs $can_link_all_static `$per_deplib && echo 2 12 23 123 123a`; do
     echo "# m$st"
     AT_CHECK([$LIBTOOL --mode=install cp m${st}$EXEEXT $bindir/m${st}$EXEEXT], [0], [ignore], [stderr])
     if $have_static; then
@@ -318,7 +318,7 @@ for withdep in no yes; do
 
 
   ### Run each program once so that relinking has happened.
-  
+
   func_fix_path $prefix1 $prefix2 $prefix3
   func_test_exec -static -static-libtool-libs -all-static `$per_deplib && echo 1 2 3 12 13 23 31 123 123a`
   func_restore_path
diff --git a/tests/template.at b/tests/template.at
index 74e1cfd9..4a549da0 100644
--- a/tests/template.at
+++ b/tests/template.at
@@ -129,7 +129,7 @@ AT_KEYWORDS([libtool])
 
 noskip=:
 # Mac OS X.
-# The linker has issues with this test. 
+# The linker has issues with this test.
 case $host in
 *-darwin*) noskip=false ;;
 esac
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 7ada4259..0c2ffcf2 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -442,7 +442,7 @@ module.lo: $(LIBTOOL) module.c
 	$(LTCOMPILE) -c module.c
 ]])
 cat >> Makefile <<EOF
-SHELL = $SHELL 
+SHELL = $SHELL
 EOF
 ])
 m4_popdef([_ARG_DIR])