diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index 3b7132ecd2651f992692e9484ee3fba2ca4e4910..efd71dd66281af267901083aec37b1824a09d5d2 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -187,10 +187,10 @@
 		"$build_dir/Inst_eddies/Tests/test_set_max_speed",
 		"$src_dir/Inst_eddies/Tests/Input/h_outermost.nc",
 		"$src_dir/Inst_eddies/Tests/Input/uv_outermost.nc",
-		"$PWD/Get_1_outerm/SHPC"
+		"$PWD/Get_1_outerm/SHPC", "$PWD/Get_1_outerm/cont_list.shp"
             ]
 	],
-	"input": "t\n", "copy": ["$PWD/Get_1_outerm/cont_list.*"]
+	"input": "t\n"
     },
     "Set_max_speed_noise": {
 	"symlink": ["$PWD/Get_1_outerm_noise_2_8/config_nml.txt"],
@@ -200,10 +200,11 @@
 		"$build_dir/Inst_eddies/Tests/test_set_max_speed",
 		"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
 		"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
-		"$PWD/Get_1_outerm_noise_2_8/SHPC"
+		"$PWD/Get_1_outerm_noise_2_8/SHPC",
+		"$PWD/Get_1_outerm_noise_2_8/cont_list.shp"
             ]
 	],
-	"input": "t\n", "copy": ["$PWD/Get_1_outerm_noise_2_8/cont_list.*"]
+	"input": "t\n"
     },
     "SHPC_degenerate":
     {
@@ -234,10 +235,11 @@
 		"$build_dir/Inst_eddies/Tests/test_set_max_speed",
 		"$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
 		"$src_dir/Inst_eddies/Tests/Input/degenerated_SSH.nc",
-		"$tests_old_dir/SHPC_degenerate/SHPC"
+		"$tests_old_dir/SHPC_degenerate/SHPC",
+		"$tests_old_dir/SHPC_degenerate/cont_list.shp"
             ]
 	],
-	"input": "f\n", "copy": ["$tests_old_dir/SHPC_degenerate/cont_list.*"]
+	"input": "f\n"
     },
     "Extraction_eddies_region_1":
     {
diff --git a/Inst_eddies/Tests/test_set_max_speed.f90 b/Inst_eddies/Tests/test_set_max_speed.f90
index 723548308552ab4253e14b35103dc11b0c2655d6..35fe306118bbbb6a8618f0bffaccef926c8833db 100644
--- a/Inst_eddies/Tests/test_set_max_speed.f90
+++ b/Inst_eddies/Tests/test_set_max_speed.f90
@@ -77,7 +77,9 @@ program test_set_max_speed
      corner_window = corner + (llc - 1) * step
      e%extr%coord_proj = nint((e%extr%coord - corner) / step) + 1
 
-     call shp_open_03(hshp, "cont_list", "rb")
+     call get_command_arg_dyn(4, path, &
+          "Required 4th argument: cont-list-shapefile")
+     call shp_open_03(hshp, path, "rb")
      call shp_get_info_03(hshp, n_cont)
      call assert(1 <= n_cont, n_cont <= n_max_cont - 1, &
           "test_set_max_speed n_cont")