diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index d9f579e2968d..fbfcf4464f3f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-21  Tobias Schlueter  <tobias.schlueter@physik.uni-muenchen.de>
+
+	* gfortran.fortran-torture/execute/select_1.f90: Rename function
+	to fix type error.
+	* gfortran.fortran-torture/execute/intrinsic_associated.f90:
+	Remove trailing spaces.
+	
 2004-06-21  Richard Henderson  <rth@redhat.com>
 
 	* gcc.dg/tree-ssa/20030714-1.c: Rename variables to avoid
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_associated.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_associated.f90
index f0518deac080..586f766010a6 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_associated.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/intrinsic_associated.f90
@@ -5,7 +5,7 @@ program intrinsic_associated
    call pointer_to_derived_1 ()
    call associated_2 ()
 end
- 
+
 subroutine pointer_to_section ()
    integer, dimension(5, 5), target :: xy
    integer, dimension(:, :), pointer :: window
@@ -36,13 +36,13 @@ end
 subroutine sub1 (a, ap)
    integer, pointer :: ap(:, :)
    integer, target :: a(10, 10)
-                                                                                
+
    ap => a
 end
 
 subroutine nullify_pp (a)
    integer, pointer :: a(:, :)
-                                                                                
+
    if (.not. associated (a)) call abort ()
    nullify (a)
 end
diff --git a/gcc/testsuite/gfortran.fortran-torture/execute/select_1.f90 b/gcc/testsuite/gfortran.fortran-torture/execute/select_1.f90
index b6ed5befedfa..2fe5b6847d86 100644
--- a/gcc/testsuite/gfortran.fortran-torture/execute/select_1.f90
+++ b/gcc/testsuite/gfortran.fortran-torture/execute/select_1.f90
@@ -1,17 +1,17 @@
 ! from PR 15962, we used to require constant expressions instead of
 ! initialization expressions in case-statements
-function x(k)
+function j(k)
 integer :: k
-integer :: x
+integer :: j
 integer, parameter :: i(2) = (/1,2/)
 
 select case(k)
 case (1:size(i))
-    x = i(k)
+    j = i(k)
 case default
-    x = 0
+    j = 0
 end select
 end function
 
-if (x(2).NE.2 .OR. x(11).NE.0) call abort()
+if (j(2).NE.2 .OR. j(11).NE.0) call abort()
 end