diff --git a/lapack-netlib/TESTING/LIN/cerrtsqr.f b/lapack-netlib/TESTING/LIN/cerrtsqr.f
index 165c8d6816..08cb5b6e53 100644
--- a/lapack-netlib/TESTING/LIN/cerrtsqr.f
+++ b/lapack-netlib/TESTING/LIN/cerrtsqr.f
@@ -73,8 +73,8 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
       INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
-      COMPLEX            A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
-     $                   C( NMAX, NMAX ), TAU(NMAX)
+      COMPLEX            A( NMAX, NMAX ), W( NMAX ),
+     $                   C( NMAX, NMAX ), TAU( 5 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, CGEQR,
@@ -103,7 +103,6 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
          DO I = 1, NMAX
             A( I, J ) = 1.E0 / CMPLX( REAL( I+J ), 0.E0 )
             C( I, J ) = 1.E0 / CMPLX( REAL( I+J ), 0.E0 )
-            T( I, J ) = 1.E0 / CMPLX( REAL( I+J ), 0.E0 )
          END DO
          W( J ) = 0.E0
       END DO
@@ -161,8 +160,9 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
 *
 *     CGEMQR
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'CGEMQR'
       NB=1
       INFOT = 1
@@ -251,8 +251,9 @@ SUBROUTINE CERRTSQR( PATH, NUNIT )
 *
 *     CGEMLQ
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'CGEMLQ'
       NB=1
       INFOT = 1
diff --git a/lapack-netlib/TESTING/LIN/derrtsqr.f b/lapack-netlib/TESTING/LIN/derrtsqr.f
index f0d345149e..bc8128cd44 100644
--- a/lapack-netlib/TESTING/LIN/derrtsqr.f
+++ b/lapack-netlib/TESTING/LIN/derrtsqr.f
@@ -73,8 +73,8 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
       INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
-      DOUBLE PRECISION   A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
-     $                   C( NMAX, NMAX ), TAU(NMAX*2)
+      DOUBLE PRECISION   A( NMAX, NMAX ), W( NMAX ),
+     $                   C( NMAX, NMAX ), TAU( 5 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, DGEQR,
@@ -103,7 +103,6 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
          DO I = 1, NMAX
             A( I, J ) = 1.D0 / DBLE( I+J )
             C( I, J ) = 1.D0 / DBLE( I+J )
-            T( I, J ) = 1.D0 / DBLE( I+J )
          END DO
          W( J ) = 0.D0
       END DO
@@ -161,10 +160,9 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
 *
 *     DGEMQR
 *
-      TAU(1)=1
-      TAU(2)=1
-      TAU(3)=1
-      TAU(4)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'DGEMQR'
       NB=1
       INFOT = 1
@@ -253,8 +251,9 @@ SUBROUTINE DERRTSQR( PATH, NUNIT )
 *
 *     DGEMLQ
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'DGEMLQ'
       NB=1
       INFOT = 1
diff --git a/lapack-netlib/TESTING/LIN/serrtsqr.f b/lapack-netlib/TESTING/LIN/serrtsqr.f
index 7f25f8b08e..0f431bec16 100644
--- a/lapack-netlib/TESTING/LIN/serrtsqr.f
+++ b/lapack-netlib/TESTING/LIN/serrtsqr.f
@@ -73,8 +73,8 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
       INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
-      REAL               A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
-     $                   C( NMAX, NMAX ), TAU(NMAX*2)
+      REAL               A( NMAX, NMAX ), W( NMAX ),
+     $                   C( NMAX, NMAX ), TAU( 5 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, SGEQR,
@@ -101,11 +101,10 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
 *
       DO J = 1, NMAX
          DO I = 1, NMAX
-            A( I, J ) = 1.D0 / REAL( I+J )
-            C( I, J ) = 1.D0 / REAL( I+J )
-            T( I, J ) = 1.D0 / REAL( I+J )
+            A( I, J ) = 1. / REAL( I+J )
+            C( I, J ) = 1. / REAL( I+J )
          END DO
-         W( J ) = 0.D0
+         W( J ) = 0.
       END DO
       OK = .TRUE.
 *
@@ -161,10 +160,9 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
 *
 *     SGEMQR
 *
-      TAU(1)=1
-      TAU(2)=1
-      TAU(3)=1
-      TAU(4)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'SGEMQR'
       NB=1
       INFOT = 1
@@ -253,8 +251,9 @@ SUBROUTINE SERRTSQR( PATH, NUNIT )
 *
 *     SGEMLQ
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'SGEMLQ'
       NB=1
       INFOT = 1
diff --git a/lapack-netlib/TESTING/LIN/zerrtsqr.f b/lapack-netlib/TESTING/LIN/zerrtsqr.f
index 19f73fa7ab..01892844e0 100644
--- a/lapack-netlib/TESTING/LIN/zerrtsqr.f
+++ b/lapack-netlib/TESTING/LIN/zerrtsqr.f
@@ -73,8 +73,8 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
       INTEGER            I, INFO, J, MB, NB
 *     ..
 *     .. Local Arrays ..
-      COMPLEX*16         A( NMAX, NMAX ), T( NMAX, NMAX ), W( NMAX ),
-     $                   C( NMAX, NMAX ), TAU(NMAX)
+      COMPLEX*16         A( NMAX, NMAX ), W( NMAX ),
+     $                   C( NMAX, NMAX ), TAU( 5 )
 *     ..
 *     .. External Subroutines ..
       EXTERNAL           ALAESM, CHKXER, ZGEQR,
@@ -103,7 +103,6 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
          DO I = 1, NMAX
             A( I, J ) = 1.D0 / DBLE( I+J )
             C( I, J ) = 1.D0 / DBLE( I+J )
-            T( I, J ) = 1.D0 / DBLE( I+J )
          END DO
          W( J ) = 0.D0
       END DO
@@ -161,8 +160,9 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
 *
 *     ZGEMQR
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'ZGEMQR'
       NB=1
       INFOT = 1
@@ -251,8 +251,9 @@ SUBROUTINE ZERRTSQR( PATH, NUNIT )
 *
 *     ZGEMLQ
 *
-      TAU(1)=1
-      TAU(2)=1
+      DO I = 1, 5
+         TAU( I ) = 1
+      END DO
       SRNAMT = 'ZGEMLQ'
       NB=1
       INFOT = 1