diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index b4c7bc69ad5020ee4d57b9b1f7eacb1e58fc7626..eb72d9cdada9fa8a4df170304a38b97ce8da0219 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -18,7 +18,7 @@ program test_set_max_speed
 
   logical cyclone
   logical periodic ! grid is periodic in longitude
-  integer nlon, nlat, d, i, n_cont
+  integer nlon, nlat, d, eddy_index, n_cont
   real, allocatable:: ssh(:, :) ! (nlon, nlat) sea-surface height, in m
   real, allocatable:: u(:, :), v(:, :) ! (nlon, nlat) wind, in m s-1
   type(eddy) e
@@ -49,7 +49,7 @@ program test_set_max_speed
   print *, "test_set_max_speed: Reading from shapefiles..."
   call get_command_arg_dyn(3, shpc_dir, "Required 3rd argument: SHPC-directory")
   call shpc_open(hshpc, shpc_dir, cyclone, slice = 0, pszaccess = "rb")
-  call read_eddy(e, d, i, hshpc, ishape = 0)
+  call read_eddy(e, d, eddy_index, hshpc, ishape = 0)
   CALL shpc_close(hshpc)
   if (.not. periodic) nlon = size(ssh, 1)
   nlat = size(ssh, 2)
@@ -76,7 +76,7 @@ program test_set_max_speed
           v(llc(1):urc(1), llc(2):urc(2)), corner_window, step)
      call shpc_create(hshpc, shpc_dir = "SHPC", cyclone = cyclone, slice = 0, &
           grid_lon_lat = .true.)
-     call write_eddy(e, hshpc, d, i)
+     call write_eddy(e, hshpc, d, eddy_index)
      write(hshpc%unit, fmt = *) 0
      CALL shpc_close(hshpc)
      print *, 'test_set_max_speed: Created "SHPC".'