From: Millian Poquet <millian.poquet@inria.fr>
Date: Thu, 1 Feb 2018 12:48:56 +0000 (+0100)
Subject: [#!] #! ./tesh -> #!/usr/bin/env tesh
X-Git-Tag: v3.19~280
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/65f2d0ee3e36c86770abe9196990f0a40b4b8221?ds=sidebyside

[#!] #! ./tesh -> #!/usr/bin/env tesh

find . \
    -type f \
    -not -iwholename '*.git*' \
    -exec sed -i -e 'sW#!\s*\./teshW#!/usr/bin/env teshWg' {} \;
---

diff --git a/examples/java/app/tokenring/app-tokenring.tesh b/examples/java/app/tokenring/app-tokenring.tesh
index 73a084d3c6..cef02614b7 100644
--- a/examples/java/app/tokenring/app-tokenring.tesh
+++ b/examples/java/app/tokenring/app-tokenring.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ java -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../platforms/routing_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.
diff --git a/examples/msg/app-masterworker/app-masterworker-multicore.tesh b/examples/msg/app-masterworker/app-masterworker-multicore.tesh
index f7be2b8b32..622ea9f99c 100644
--- a/examples/msg/app-masterworker/app-masterworker-multicore.tesh
+++ b/examples/msg/app-masterworker/app-masterworker-multicore.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a simple master/worker example application
 
diff --git a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
index bfb58a5b0f..16ac3e19ce 100644
--- a/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
+++ b/examples/msg/app-masterworker/app-masterworker-vivaldi.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a simple master/worker example application
 
diff --git a/examples/msg/app-masterworker/app-masterworker.tesh b/examples/msg/app-masterworker/app-masterworker.tesh
index 21623e9a28..91e3d7a488 100644
--- a/examples/msg/app-masterworker/app-masterworker.tesh
+++ b/examples/msg/app-masterworker/app-masterworker.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a simple master/worker example application (mailbox version)
 
diff --git a/examples/msg/cloud-masterworker/cloud-masterworker.tesh b/examples/msg/cloud-masterworker/cloud-masterworker.tesh
index 4490cb95fa..aacd8f1d69 100644
--- a/examples/msg/cloud-masterworker/cloud-masterworker.tesh
+++ b/examples/msg/cloud-masterworker/cloud-masterworker.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Cloud API with a simple master/workers
 
diff --git a/examples/msg/dht-kademlia/dht-kademlia.tesh b/examples/msg/dht-kademlia/dht-kademlia.tesh
index 6e513c012e..e34f10f1ae 100644
--- a/examples/msg/dht-kademlia/dht-kademlia.tesh
+++ b/examples/msg/dht-kademlia/dht-kademlia.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Kademlia implementation with MSG
 
diff --git a/examples/msg/dht-pastry/dht-pastry.tesh b/examples/msg/dht-pastry/dht-pastry.tesh
index 407ac703d9..d86b3ae825 100644
--- a/examples/msg/dht-pastry/dht-pastry.tesh
+++ b/examples/msg/dht-pastry/dht-pastry.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Pastry implementation with MSG
 
diff --git a/examples/msg/energy-vm/energy-vm.tesh b/examples/msg/energy-vm/energy-vm.tesh
index 47ba393355..b8ab020d5c 100644
--- a/examples/msg/energy-vm/energy-vm.tesh
+++ b/examples/msg/energy-vm/energy-vm.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing host energy consumption in case of VMs
 
diff --git a/examples/msg/maestro-set/maestro-set.tesh b/examples/msg/maestro-set/maestro-set.tesh
index a3914dca77..eaa6324804 100644
--- a/examples/msg/maestro-set/maestro-set.tesh
+++ b/examples/msg/maestro-set/maestro-set.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV maestro-set/maestro-set$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) I am not the main thread, as expected
diff --git a/examples/msg/mc/bugged1.tesh b/examples/msg/mc/bugged1.tesh
index 0ff51f6d39..ae74260d40 100644
--- a/examples/msg/mc/bugged1.tesh
+++ b/examples/msg/mc/bugged1.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 1
 ! timeout 20
diff --git a/examples/msg/mc/bugged1_liveness.tesh b/examples/msg/mc/bugged1_liveness.tesh
index 519a86e2eb..50c01be246 100644
--- a/examples/msg/mc/bugged1_liveness.tesh
+++ b/examples/msg/mc/bugged1_liveness.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 2
 ! timeout 20
diff --git a/examples/msg/mc/bugged1_liveness_sparse.tesh b/examples/msg/mc/bugged1_liveness_sparse.tesh
index 76be52f6e2..f22813bffd 100644
--- a/examples/msg/mc/bugged1_liveness_sparse.tesh
+++ b/examples/msg/mc/bugged1_liveness_sparse.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 2
 ! timeout 20
diff --git a/examples/msg/mc/bugged1_liveness_visited.tesh b/examples/msg/mc/bugged1_liveness_visited.tesh
index 8966f6d0fd..4a3fd2feb8 100644
--- a/examples/msg/mc/bugged1_liveness_visited.tesh
+++ b/examples/msg/mc/bugged1_liveness_visited.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 2
 ! timeout 20
diff --git a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh
index c584098f53..7a4f893aec 100644
--- a/examples/msg/mc/bugged1_liveness_visited_sparse.tesh
+++ b/examples/msg/mc/bugged1_liveness_visited_sparse.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 2
 ! timeout 20
diff --git a/examples/msg/mc/bugged2.tesh b/examples/msg/mc/bugged2.tesh
index 4609e75beb..8f32941c77 100644
--- a/examples/msg/mc/bugged2.tesh
+++ b/examples/msg/mc/bugged2.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! expect return 1
 ! timeout 20
diff --git a/examples/msg/mc/centralized_mutex.tesh b/examples/msg/mc/centralized_mutex.tesh
index ca980b8aef..52986c45f0 100644
--- a/examples/msg/mc/centralized_mutex.tesh
+++ b/examples/msg/mc/centralized_mutex.tesh
@@ -1,3 +1,3 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/centralized_mutex
diff --git a/examples/msg/network-ns3/network-ns3.tesh b/examples/msg/network-ns3/network-ns3.tesh
index 3a1963d18f..06c497c640 100644
--- a/examples/msg/network-ns3/network-ns3.tesh
+++ b/examples/msg/network-ns3/network-ns3.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p In the NS3 tests, the timings are not shown because the exact values may vary with your NS3 version. 
 p We just want to check that the NS3 bindings of SimGrid are working correctly, we don't want to thoroughly test NS3.
diff --git a/examples/msg/platform-failures/platform-failures.tesh b/examples/msg/platform-failures/platform-failures.tesh
index 15732ab6ae..a169ce4015 100644
--- a/examples/msg/platform-failures/platform-failures.tesh
+++ b/examples/msg/platform-failures/platform-failures.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a simple master/worker example application handling failures TCP crosstraffic DISABLED
 
diff --git a/examples/msg/process-create/process-create.tesh b/examples/msg/process-create/process-create.tesh
index 231e769769..01f5c97295 100644
--- a/examples/msg/process-create/process-create.tesh
+++ b/examples/msg/process-create/process-create.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Start remote processes 
 $ $SG_TEST_EXENV ${bindir:=.}/process-create$EXEEXT ${platfdir}/small_platform.xml
diff --git a/examples/msg/synchro-semaphore/synchro-semaphore.tesh b/examples/msg/synchro-semaphore/synchro-semaphore.tesh
index 85340f1e9d..5a55609f4f 100644
--- a/examples/msg/synchro-semaphore/synchro-semaphore.tesh
+++ b/examples/msg/synchro-semaphore/synchro-semaphore.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing synchronization with semaphores
 
diff --git a/examples/msg/trace-categories/trace-categories.tesh b/examples/msg/trace-categories/trace-categories.tesh
index 638b58d971..fdabdbdb19 100644
--- a/examples/msg/trace-categories/trace-categories.tesh
+++ b/examples/msg/trace-categories/trace-categories.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing multiple categories master/worker application
 
diff --git a/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh
index 6797d79eeb..be7db022f3 100644
--- a/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh
+++ b/examples/msg/trace-host-user-variables/trace-host-user-variables.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing user variables for hosts
 $ $SG_TEST_EXENV ${bindir:=.}/trace-host-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml
diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
index af93239cf4..bc6c3d8181 100644
--- a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
+++ b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Trace user variables associated to links of the platform file
 $ $SG_TEST_EXENV ${bindir:=.}/trace-link-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml
diff --git a/examples/msg/trace-masterworker/trace-masterworker.tesh b/examples/msg/trace-masterworker/trace-masterworker.tesh
index f8192fd1df..d6894f8dbf 100644
--- a/examples/msg/trace-masterworker/trace-masterworker.tesh
+++ b/examples/msg/trace-masterworker/trace-masterworker.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing master/worker application
 $ $SG_TEST_EXENV ${bindir:=.}/trace-masterworker$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:trace-masterworker.trace --cfg=tracing/categorized:yes --cfg=tracing/uncategorized:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml
diff --git a/examples/msg/trace-process-migration/trace-process-migration.tesh b/examples/msg/trace-process-migration/trace-process-migration.tesh
index 0a5d7c6c90..2326be5050 100644
--- a/examples/msg/trace-process-migration/trace-process-migration.tesh
+++ b/examples/msg/trace-process-migration/trace-process-migration.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing processes
 $ $SG_TEST_EXENV ${bindir:=.}/trace-process-migration$EXEEXT --cfg=tracing:yes --cfg=tracing/buffer:yes --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:yes ${platfdir}/small_platform.xml
diff --git a/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh b/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh
index fe50f9edc9..7a92175345 100644
--- a/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh
+++ b/examples/msg/trace-route-user-variables/trace-route-user-variables.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Trace user variables associated to links of the platform file
 $ $SG_TEST_EXENV ${bindir:=.}/trace-route-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${platfdir}/small_platform.xml ${srcdir}/../app-masterworker/app-masterworker_d.xml
diff --git a/examples/s4u/actor-create/s4u-actor-create.tesh b/examples/s4u/actor-create/s4u-actor-create.tesh
index f907ba1d33..67c1549414 100644
--- a/examples/s4u/actor-create/s4u-actor-create.tesh
+++ b/examples/s4u/actor-create/s4u-actor-create.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-create
 > [Tremblay:sender1:(1) 0.000000] [s4u_actor_create/INFO] Hello s4u, I have something to send
diff --git a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
index aff48b558b..5f7cb69aa9 100644
--- a/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
+++ b/examples/s4u/actor-daemon/s4u-actor-daemon.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the process daemonization feature
 
diff --git a/examples/s4u/actor-kill/s4u-actor-kill.tesh b/examples/s4u/actor-kill/s4u-actor-kill.tesh
index 9e5b0a295b..2e3145813c 100644
--- a/examples/s4u/actor-kill/s4u-actor-kill.tesh
+++ b/examples/s4u/actor-kill/s4u-actor-kill.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-kill ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (killer@Tremblay) Hello!
diff --git a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
index e8743a159e..2f6c5be924 100644
--- a/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
+++ b/examples/s4u/actor-lifetime/s4u-actor-lifetime.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-lifetime ${platfdir}/cluster.xml s4u-actor-lifetime_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
diff --git a/examples/s4u/actor-migration/s4u-actor-migration.tesh b/examples/s4u/actor-migration/s4u-actor-migration.tesh
index 6c82febe7d..5e6e383e0e 100644
--- a/examples/s4u/actor-migration/s4u-actor-migration.tesh
+++ b/examples/s4u/actor-migration/s4u-actor-migration.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the actor migration feature 
 
diff --git a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh
index 1d6e410c0a..840b48251f 100644
--- a/examples/s4u/actor-suspend/s4u-actor-suspend.tesh
+++ b/examples/s4u/actor-suspend/s4u-actor-suspend.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the suspend/resume feature of S4U
 
diff --git a/examples/s4u/actor-yield/s4u-actor-yield.tesh b/examples/s4u/actor-yield/s4u-actor-yield.tesh
index eab86b4b06..b61c4f2c3d 100644
--- a/examples/s4u/actor-yield/s4u-actor-yield.tesh
+++ b/examples/s4u/actor-yield/s4u-actor-yield.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-actor-yield ${platfdir}/small_platform_fatpipe.xml s4u-actor-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now!
diff --git a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
index 541e9000df..ae84ce8df0 100644
--- a/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
+++ b/examples/s4u/app-bittorrent/s4u-app-bittorrent.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Bittorrent implementation with S4U
 
diff --git a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
index 86fc41c8b4..dc325c4532 100644
--- a/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
+++ b/examples/s4u/app-chainsend/s4u-app-chainsend.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the chainsend S4U implementation
 
diff --git a/examples/s4u/app-masterworker/s4u-app-masterworker.tesh b/examples/s4u/app-masterworker/s4u-app-masterworker.tesh
index 99c0f65c87..0ca64c831d 100644
--- a/examples/s4u/app-masterworker/s4u-app-masterworker.tesh
+++ b/examples/s4u/app-masterworker/s4u-app-masterworker.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a simple master/worker example application (mailbox version)
 
diff --git a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
index c0a2a11c1d..30f59caff8 100644
--- a/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
+++ b/examples/s4u/app-pingpong/s4u-app-pingpong.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing with default compound
 
diff --git a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh
index 681a7601c7..a22c51b9aa 100644
--- a/examples/s4u/app-token-ring/s4u-app-token-ring.tesh
+++ b/examples/s4u/app-token-ring/s4u-app-token-ring.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%P@%h)%e%m%n"
 > [  0.000000] (maestro@) Number of hosts '6'
diff --git a/examples/s4u/async-wait/s4u-async-wait.tesh b/examples/s4u/async-wait/s4u-async-wait.tesh
index eaf9810c12..8f9f795da9 100644
--- a/examples/s4u/async-wait/s4u-async-wait.tesh
+++ b/examples/s4u/async-wait/s4u-async-wait.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Test1 Sleep_sender > Sleep_receiver
 
diff --git a/examples/s4u/async-waitall/s4u-async-waitall.tesh b/examples/s4u/async-waitall/s4u-async-waitall.tesh
index 6c3cda3355..bdec4c962b 100644
--- a/examples/s4u/async-waitall/s4u-async-waitall.tesh
+++ b/examples/s4u/async-waitall/s4u-async-waitall.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-async-waitall ${platfdir}/small_platform_fatpipe.xml s4u-async-waitall_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver-0'
diff --git a/examples/s4u/async-waitany/s4u-async-waitany.tesh b/examples/s4u/async-waitany/s4u-async-waitany.tesh
index ceab52a2ad..27eec6bcaa 100644
--- a/examples/s4u/async-waitany/s4u-async-waitany.tesh
+++ b/examples/s4u/async-waitany/s4u-async-waitany.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing this_actor->wait_any()
 
diff --git a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
index a764a8c9b5..87e6c25e4d 100644
--- a/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
+++ b/examples/s4u/cloud-simple/s4u-cloud-simple.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a vm with two successive tasks
 
diff --git a/examples/s4u/dht-chord/s4u-dht-chord.tesh b/examples/s4u/dht-chord/s4u-dht-chord.tesh
index ee94501a81..10f9ce67e9 100644
--- a/examples/s4u/dht-chord/s4u-dht-chord.tesh
+++ b/examples/s4u/dht-chord/s4u-dht-chord.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Chord implementation with MSG
 
diff --git a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
index ec1a873132..b720e41067 100644
--- a/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
+++ b/examples/s4u/dht-kademlia/s4u-dht-kademlia.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Kademlia implementation with MSG
 
diff --git a/examples/s4u/energy-boot/s4u-energy-boot.tesh b/examples/s4u/energy-boot/s4u-energy-boot.tesh
index 6f9f4c9f40..15f1848d6e 100644
--- a/examples/s4u/energy-boot/s4u-energy-boot.tesh
+++ b/examples/s4u/energy-boot/s4u-energy-boot.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Modeling the host energy consumption during boot and shutdown
 
diff --git a/examples/s4u/energy-exec/s4u-energy-exec.tesh b/examples/s4u/energy-exec/s4u-energy-exec.tesh
index 4848fea27d..d1b5705692 100644
--- a/examples/s4u/energy-exec/s4u-energy-exec.tesh
+++ b/examples/s4u/energy-exec/s4u-energy-exec.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing host energy consumption
 
diff --git a/examples/s4u/energy-link/s4u-energy-link.tesh b/examples/s4u/energy-link/s4u-energy-link.tesh
index 5febcd0762..1e1c65da7b 100644
--- a/examples/s4u/energy-link/s4u-energy-link.tesh
+++ b/examples/s4u/energy-link/s4u-energy-link.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing link energy consumption (using CM02 as a network model)
 
diff --git a/examples/s4u/energy-vm/s4u-energy-vm.tesh b/examples/s4u/energy-vm/s4u-energy-vm.tesh
index 08f8f4f292..3b8b7accd5 100644
--- a/examples/s4u/energy-vm/s4u-energy-vm.tesh
+++ b/examples/s4u/energy-vm/s4u-energy-vm.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing host energy consumption in case of VMs
 
diff --git a/examples/s4u/exec-async/s4u-exec-async.tesh b/examples/s4u/exec-async/s4u-exec-async.tesh
index 86fcf8583d..e77373825e 100644
--- a/examples/s4u/exec-async/s4u-exec-async.tesh
+++ b/examples/s4u/exec-async/s4u-exec-async.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! output sort 19
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-async$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
diff --git a/examples/s4u/exec-basic/s4u-exec-basic.tesh b/examples/s4u/exec-basic/s4u-exec-basic.tesh
index 21f58675a0..4a453449a9 100644
--- a/examples/s4u/exec-basic/s4u-exec-basic.tesh
+++ b/examples/s4u/exec-basic/s4u-exec-basic.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Start remote processes 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-basic$EXEEXT ${platfdir}/small_platform.xml 
diff --git a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
index dd0fe02587..4ac2d9bef6 100644
--- a/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
+++ b/examples/s4u/exec-dvfs/s4u-exec-dvfs.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the DVFS-related functions
 
diff --git a/examples/s4u/exec-monitor/s4u-exec-monitor.tesh b/examples/s4u/exec-monitor/s4u-exec-monitor.tesh
index 0aff0bd44a..45de5dd098 100644
--- a/examples/s4u/exec-monitor/s4u-exec-monitor.tesh
+++ b/examples/s4u/exec-monitor/s4u-exec-monitor.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Start several asynchronous tasks and monitor them
 
diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
index a9f86bb231..77a383b283 100644
--- a/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
+++ b/examples/s4u/exec-ptask/s4u-exec-ptask.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/s4u-exec-ptask$EXEEXT ${platfdir}/energy_platform.xml --energy --cfg=host/model:ptask_L07 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'ptask_L07'
diff --git a/examples/s4u/exec-remote/s4u-exec-remote.tesh b/examples/s4u/exec-remote/s4u-exec-remote.tesh
index 3c3cbd3811..363fb20ae2 100644
--- a/examples/s4u/exec-remote/s4u-exec-remote.tesh
+++ b/examples/s4u/exec-remote/s4u-exec-remote.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! output sort 19
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-exec-remote$EXEEXT ${platfdir}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
diff --git a/examples/s4u/io-file-remote/s4u-io-file-remote.tesh b/examples/s4u/io-file-remote/s4u-io-file-remote.tesh
index 803a1e011b..6781b50453 100644
--- a/examples/s4u/io-file-remote/s4u-io-file-remote.tesh
+++ b/examples/s4u/io-file-remote/s4u-io-file-remote.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/s4u-io-file-remote$EXEEXT ${platfdir}/storage/remote_io.xml s4u-io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n"
 > [  0.000000] (0@     ) Init: 12/476824 MiB used/free on 'Disk1'
diff --git a/examples/s4u/io-file-system/s4u-io-file-system.tesh b/examples/s4u/io-file-system/s4u-io-file-system.tesh
index e89c8e1f46..303cbb313a 100644
--- a/examples/s4u/io-file-system/s4u-io-file-system.tesh
+++ b/examples/s4u/io-file-system/s4u-io-file-system.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-io-file-system ${platfdir}/storage/storage.xml
 > [denise:host:(1) 0.000000] [s4u_test/INFO] Storage info on denise:
diff --git a/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh b/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh
index c72cbb36f1..65b09de258 100644
--- a/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh
+++ b/examples/s4u/io-storage-raw/s4u-io-storage-raw.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir}/s4u-io-storage-raw$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:@denise) *** Storage info on denise ***
diff --git a/examples/s4u/mutex/s4u-mutex.tesh b/examples/s4u/mutex/s4u-mutex.tesh
index 42ef210bfb..ac3127ffcd 100644
--- a/examples/s4u/mutex/s4u-mutex.tesh
+++ b/examples/s4u/mutex/s4u-mutex.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-mutex
 > [Jupiter:worker:(2) 0.000000] [s4u_test/INFO] Hello s4u, I'm ready to compute after a lock_guard
diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/s4u/platform-properties/s4u-platform-properties.tesh
index f5c225a7f6..351105acf0 100644
--- a/examples/s4u/platform-properties/s4u-platform-properties.tesh
+++ b/examples/s4u/platform-properties/s4u-platform-properties.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a S4U application with properties in the XML for Hosts, Links and Actors
 
diff --git a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
index 03229a8a57..5eef89c23a 100644
--- a/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
+++ b/examples/s4u/plugin-hostload/s4u-plugin-hostload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops)
 
diff --git a/examples/s4u/trace-platform/s4u-trace-platform.tesh b/examples/s4u/trace-platform/s4u-trace-platform.tesh
index 6af7e88b0d..cdd42740a0 100644
--- a/examples/s4u/trace-platform/s4u-trace-platform.tesh
+++ b/examples/s4u/trace-platform/s4u-trace-platform.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Tracing platform only
 $ $SG_TEST_EXENV ${bindir:=.}/s4u-trace-platform$EXEEXT --cfg=tracing:yes --cfg=tracing/filename:trace_platform.trace --cfg=tracing/categorized:yes ${platfdir}/small_platform.xml
diff --git a/examples/simdag/availability/sd_availability.tesh b/examples/simdag/availability/sd_availability.tesh
index 4d667c6dff..d067977ac4 100644
--- a/examples/simdag/availability/sd_availability.tesh
+++ b/examples/simdag/availability/sd_availability.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Test of the management of availability traces with simdag
 
diff --git a/examples/simdag/dag-dotload/sd_dag-dotload.tesh b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
index 0afa3f46f9..68337f1186 100644
--- a/examples/simdag/dag-dotload/sd_dag-dotload.tesh
+++ b/examples/simdag/dag-dotload/sd_dag-dotload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Test the loader of DAG written in the DOT format
 
 # The order differ when executed with gcc's thread sanitizer
diff --git a/examples/simdag/daxload/sd_daxload.tesh b/examples/simdag/daxload/sd_daxload.tesh
index 90cc46b810..c81779d426 100644
--- a/examples/simdag/daxload/sd_daxload.tesh
+++ b/examples/simdag/daxload/sd_daxload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Test the DAX loader on a small DAX instance
 
 ! output sort
diff --git a/examples/simdag/fail/sd_fail.tesh b/examples/simdag/fail/sd_fail.tesh
index e3dc2b1252..8bdd96bfd2 100644
--- a/examples/simdag/fail/sd_fail.tesh
+++ b/examples/simdag/fail/sd_fail.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Test of the management of failed tasks simdag
 
diff --git a/examples/simdag/properties/sd_properties.tesh b/examples/simdag/properties/sd_properties.tesh
index 77be2a2538..0377810c35 100644
--- a/examples/simdag/properties/sd_properties.tesh
+++ b/examples/simdag/properties/sd_properties.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Simple test of simdag with properties
 
diff --git a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
index 9b4ec8ed30..c68786fdc2 100644
--- a/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
+++ b/examples/simdag/ptg-dotload/sd_ptg-dotload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Test the loader of PTG (Parallel Task Graph) written in the DOT format
 
 # The order differ when executed with gcc's thread sanitizer
diff --git a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
index 4beb06d154..d59c98516e 100644
--- a/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
+++ b/examples/simdag/schedule-dotload/sd_schedule-dotload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Test the loader of DAG written in the DOT format
 
 ! expect return 2
diff --git a/examples/simdag/scheduling/sd_scheduling.tesh b/examples/simdag/scheduling/sd_scheduling.tesh
index d0d3e6983a..49cd9dee58 100644
--- a/examples/simdag/scheduling/sd_scheduling.tesh
+++ b/examples/simdag/scheduling/sd_scheduling.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Simple test of simdag
 
diff --git a/examples/simdag/test/sd_test.tesh b/examples/simdag/test/sd_test.tesh
index b8b6897bb7..3b063a6907 100644
--- a/examples/simdag/test/sd_test.tesh
+++ b/examples/simdag/test/sd_test.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Simple test of simdag
 
diff --git a/examples/simdag/throttling/sd_throttling.tesh b/examples/simdag/throttling/sd_throttling.tesh
index c0cd2e6084..1d5e5b2811 100644
--- a/examples/simdag/throttling/sd_throttling.tesh
+++ b/examples/simdag/throttling/sd_throttling.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Modify the rate of communication tasks even when they are auto-scheduled
 
 # We need to sort this out because the order changes with the sanitizers (at least)
diff --git a/examples/simdag/typed_tasks/sd_typed_tasks.tesh b/examples/simdag/typed_tasks/sd_typed_tasks.tesh
index 9da9ebb0b2..eb9e71a407 100644
--- a/examples/simdag/typed_tasks/sd_typed_tasks.tesh
+++ b/examples/simdag/typed_tasks/sd_typed_tasks.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Usage test of simdag's typed tasks
 
 ! output sort
diff --git a/examples/smpi/mc/non_deterministic.tesh b/examples/smpi/mc/non_deterministic.tesh
index a69af437ac..634c2721e0 100644
--- a/examples/smpi/mc/non_deterministic.tesh
+++ b/examples/smpi/mc/non_deterministic.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! timeout 60
 $ ../../../smpi_script/bin/smpirun -wrapper ${bindir:=.}/../../../bin/simgrid-mc -hostfile ${srcdir:=.}/hostfile_non_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --log=xbt_cfg.thresh:warning --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_non_deterministic
diff --git a/examples/smpi/mc/only_send_deterministic.tesh b/examples/smpi/mc/only_send_deterministic.tesh
index 74ae1f2a8e..8d70599b23 100644
--- a/examples/smpi/mc/only_send_deterministic.tesh
+++ b/examples/smpi/mc/only_send_deterministic.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! timeout 60
 $ ../../../smpi_script/bin/smpirun -wrapper "${bindir:=.}/../../../bin/simgrid-mc" --log=xbt_cfg.thresh:warning -hostfile ${srcdir:=.}/hostfile_only_send_deterministic  -platform ${srcdir:=.}/../../platforms/cluster.xml --cfg=model-check/communications-determinism:1 --cfg=smpi/send-is-detached-thresh:0 --cfg=smpi/host-speed:1e9 ./smpi_only_send_deterministic
diff --git a/teshsuite/mc/dwarf-expression/dwarf-expression.tesh b/teshsuite/mc/dwarf-expression/dwarf-expression.tesh
index ca63bc2cf1..471fa94da9 100644
--- a/teshsuite/mc/dwarf-expression/dwarf-expression.tesh
+++ b/teshsuite/mc/dwarf-expression/dwarf-expression.tesh
@@ -1,3 +1,3 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/dwarf-expression
diff --git a/teshsuite/mc/dwarf/dwarf.tesh b/teshsuite/mc/dwarf/dwarf.tesh
index 0491dadc2d..6c3b12c23f 100644
--- a/teshsuite/mc/dwarf/dwarf.tesh
+++ b/teshsuite/mc/dwarf/dwarf.tesh
@@ -1,3 +1,3 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/dwarf
diff --git a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
index 09080213d4..fed52d9976 100644
--- a/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
+++ b/teshsuite/msg/app-bittorrent/app-bittorrent.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the Bittorrent implementation with MSG
 
diff --git a/teshsuite/msg/app-chainsend/app-chainsend.tesh b/teshsuite/msg/app-chainsend/app-chainsend.tesh
index 17097fa732..f983dac097 100644
--- a/teshsuite/msg/app-chainsend/app-chainsend.tesh
+++ b/teshsuite/msg/app-chainsend/app-chainsend.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the chainsend MSG implementation
 
diff --git a/teshsuite/msg/app-pingpong/app-pingpong.tesh b/teshsuite/msg/app-pingpong/app-pingpong.tesh
index 3ac7058367..aa9f5c6ebf 100644
--- a/teshsuite/msg/app-pingpong/app-pingpong.tesh
+++ b/teshsuite/msg/app-pingpong/app-pingpong.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing with default compound
 
diff --git a/teshsuite/msg/app-token-ring/app-token-ring.tesh b/teshsuite/msg/app-token-ring/app-token-ring.tesh
index b8fd34cbb4..00c488ed4b 100644
--- a/teshsuite/msg/app-token-ring/app-token-ring.tesh
+++ b/teshsuite/msg/app-token-ring/app-token-ring.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Number of hosts '6'
diff --git a/teshsuite/msg/async-wait/async-wait.tesh b/teshsuite/msg/async-wait/async-wait.tesh
index c68fb5a707..322ad38f27 100644
--- a/teshsuite/msg/async-wait/async-wait.tesh
+++ b/teshsuite/msg/async-wait/async-wait.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Test1 MSG_comm_test() with Sleep_sender > Sleep_receiver
 
diff --git a/teshsuite/msg/async-waitall/async-waitall.tesh b/teshsuite/msg/async-waitall/async-waitall.tesh
index 838c2e9952..717ac312f6 100644
--- a/teshsuite/msg/async-waitall/async-waitall.tesh
+++ b/teshsuite/msg/async-waitall/async-waitall.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p Test1 MSG_comm_waitall() for sender
 
 ! output sort 19
diff --git a/teshsuite/msg/async-waitany/async-waitany.tesh b/teshsuite/msg/async-waitany/async-waitany.tesh
index b9f7384783..821c1d7302 100644
--- a/teshsuite/msg/async-waitany/async-waitany.tesh
+++ b/teshsuite/msg/async-waitany/async-waitany.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the MSG_comm_waitany function
 
diff --git a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
index a06a44ff89..052a489c28 100644
--- a/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
+++ b/teshsuite/msg/cloud-sharing/cloud-sharing.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/cloud-sharing$EXEEXT --log=root.fmt:%m%n ${platfdir}/cluster_backbone.xml
 > # TEST ON SINGLE-CORE PMs
diff --git a/teshsuite/msg/cloud-simple/cloud-simple.tesh b/teshsuite/msg/cloud-simple/cloud-simple.tesh
index cd26fb6065..795fb86793 100644
--- a/teshsuite/msg/cloud-simple/cloud-simple.tesh
+++ b/teshsuite/msg/cloud-simple/cloud-simple.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a vm with two successive tasks
 
diff --git a/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh b/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh
index b20f55c1aa..c99a8a6508 100644
--- a/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh
+++ b/teshsuite/msg/cloud-two-tasks/cloud-two-tasks.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a vm with two successive tasks
 
diff --git a/teshsuite/msg/energy-consumption/energy-consumption.tesh b/teshsuite/msg/energy-consumption/energy-consumption.tesh
index f1ba449225..58259d26f7 100644
--- a/teshsuite/msg/energy-consumption/energy-consumption.tesh
+++ b/teshsuite/msg/energy-consumption/energy-consumption.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the mechanism for computing host energy consumption
 
diff --git a/teshsuite/msg/energy-pstate/energy-pstate.tesh b/teshsuite/msg/energy-pstate/energy-pstate.tesh
index 3d915e1ce4..6dddbd6893 100644
--- a/teshsuite/msg/energy-pstate/energy-pstate.tesh
+++ b/teshsuite/msg/energy-pstate/energy-pstate.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the DVFS-related functions
 
diff --git a/teshsuite/msg/energy-ptask/energy-ptask.tesh b/teshsuite/msg/energy-ptask/energy-ptask.tesh
index 1a102044c0..6848fdbc97 100644
--- a/teshsuite/msg/energy-ptask/energy-ptask.tesh
+++ b/teshsuite/msg/energy-ptask/energy-ptask.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/energy-ptask$EXEEXT ${platfdir:=.}/energy_platform.xml --energy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
diff --git a/teshsuite/msg/io-file-remote/io-file-remote.tesh b/teshsuite/msg/io-file-remote/io-file-remote.tesh
index c7377c9e9f..7f3119dc20 100644
--- a/teshsuite/msg/io-file-remote/io-file-remote.tesh
+++ b/teshsuite/msg/io-file-remote/io-file-remote.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/io-file-remote$EXEEXT ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/io-file-remote_d.xml "--log=root.fmt:[%10.6r]%e(%i@%5h)%e%m%n"
 > [  0.000000] (0@     ) Init: 12/476824 MiB used/free on 'Disk1'
diff --git a/teshsuite/msg/io-file/io-file.tesh b/teshsuite/msg/io-file/io-file.tesh
index aa9b2874f0..636d10e7db 100644
--- a/teshsuite/msg/io-file/io-file.tesh
+++ b/teshsuite/msg/io-file/io-file.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/io-file ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Number of host '4'
diff --git a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh
index 893abf6937..aa11c7b7f9 100644
--- a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh
+++ b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir}/io-raw-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:@denise) *** Storage info on denise ***
diff --git a/teshsuite/msg/platform-properties/platform-properties.tesh b/teshsuite/msg/platform-properties/platform-properties.tesh
index 079c43b836..09bb106c3b 100644
--- a/teshsuite/msg/platform-properties/platform-properties.tesh
+++ b/teshsuite/msg/platform-properties/platform-properties.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a MSG application with properties in the XML for Hosts, Links and Processes
 
diff --git a/teshsuite/msg/plugin-hostload/plugin-hostload.tesh b/teshsuite/msg/plugin-hostload/plugin-hostload.tesh
index 1ae59ccc9c..0cb5cfab4c 100644
--- a/teshsuite/msg/plugin-hostload/plugin-hostload.tesh
+++ b/teshsuite/msg/plugin-hostload/plugin-hostload.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This tests the HostLoad plugin (this allows the user to get the current load of a host and the computed flops)
 
diff --git a/teshsuite/msg/process-daemon/process-daemon.tesh b/teshsuite/msg/process-daemon/process-daemon.tesh
index 91cf79e7d8..226fbdf12a 100644
--- a/teshsuite/msg/process-daemon/process-daemon.tesh
+++ b/teshsuite/msg/process-daemon/process-daemon.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the process daemonization feature of MSG
 
diff --git a/teshsuite/msg/process-kill/process-kill.tesh b/teshsuite/msg/process-kill/process-kill.tesh
index 7b20fb9ab8..f20a32d9dc 100644
--- a/teshsuite/msg/process-kill/process-kill.tesh
+++ b/teshsuite/msg/process-kill/process-kill.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a MSG_process_kill function
 
diff --git a/teshsuite/msg/process-lifetime/process-lifetime.tesh b/teshsuite/msg/process-lifetime/process-lifetime.tesh
index 3962690c50..8ab9a51260 100644
--- a/teshsuite/msg/process-lifetime/process-lifetime.tesh
+++ b/teshsuite/msg/process-lifetime/process-lifetime.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Test0 Process without time
 
diff --git a/teshsuite/msg/process-migration/process-migration.tesh b/teshsuite/msg/process-migration/process-migration.tesh
index 9db6b71edd..05e95a2866 100644
--- a/teshsuite/msg/process-migration/process-migration.tesh
+++ b/teshsuite/msg/process-migration/process-migration.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the migration feature of MSG
 
diff --git a/teshsuite/msg/process-suspend/process-suspend.tesh b/teshsuite/msg/process-suspend/process-suspend.tesh
index b3e0962fb4..a7f41fce5b 100644
--- a/teshsuite/msg/process-suspend/process-suspend.tesh
+++ b/teshsuite/msg/process-suspend/process-suspend.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing the suspend/resume feature of MSG
 
diff --git a/teshsuite/msg/process-yield/process-yield.tesh b/teshsuite/msg/process-yield/process-yield.tesh
index d4d18cda7b..458bfedf7f 100644
--- a/teshsuite/msg/process-yield/process-yield.tesh
+++ b/teshsuite/msg/process-yield/process-yield.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/process-yield ${platfdir}/small_platform_fatpipe.xml ${srcdir:=.}/process-yield_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:yielder@Tremblay) I yielded 10 times. Goodbye now!
diff --git a/teshsuite/msg/task-priority/task-priority.tesh b/teshsuite/msg/task-priority/task-priority.tesh
index 0e8d6f2ff6..5679db9f4f 100644
--- a/teshsuite/msg/task-priority/task-priority.tesh
+++ b/teshsuite/msg/task-priority/task-priority.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! output sort 19
 $ $SG_TEST_EXENV ${bindir:=.}/task-priority$EXEEXT ${platfdir}/small_platform.xml  ${srcdir}/task-priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
diff --git a/teshsuite/msg/trace_integration/trace_integration.tesh b/teshsuite/msg/trace_integration/trace_integration.tesh
index d3b9e30bee..c60d1916ca 100644
--- a/teshsuite/msg/trace_integration/trace_integration.tesh
+++ b/teshsuite/msg/trace_integration/trace_integration.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 p c=cycle s=step p=priority h=host
 
 p Testing trace integration using trace_B.txt and test-hbp1-c0s0-c0s1.xml, test_trace:start == trace_cycle_0_step_0, test_trace:end < trace_cycle_0_step_1
diff --git a/teshsuite/simdag/basic-link-test/basic-link-test.tesh b/teshsuite/simdag/basic-link-test/basic-link-test.tesh
index a68f72c662..c52ace0841 100644
--- a/teshsuite/simdag/basic-link-test/basic-link-test.tesh
+++ b/teshsuite/simdag/basic-link-test/basic-link-test.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/basic-link-test ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
index 4e773bebc9..398927f654 100644
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-bypass.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a bypass ASroute
 
diff --git a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
index dffd43cf58..12a911e4bd 100644
--- a/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
+++ b/teshsuite/simdag/basic-parsing-test/basic-parsing-test-sym-full.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 ! output sort
 
 $ ${bindir:=.}/basic-parsing-test ../platforms/one_cluster_fullduplex.xml FULL_LINK "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
diff --git a/teshsuite/simdag/flatifier/flatifier.tesh b/teshsuite/simdag/flatifier/flatifier.tesh
index 1fd4bbfab0..8d0565ab00 100644
--- a/teshsuite/simdag/flatifier/flatifier.tesh
+++ b/teshsuite/simdag/flatifier/flatifier.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 $ ${bindir:=.}/flatifier$EXEEXT ../platforms/one_cluster.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
 > <?xml version='1.0'?>
diff --git a/teshsuite/simdag/is-router/is-router.tesh b/teshsuite/simdag/is-router/is-router.tesh
index 80d0a67b51..d1d27f7ef0 100644
--- a/teshsuite/simdag/is-router/is-router.tesh
+++ b/teshsuite/simdag/is-router/is-router.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/is-router ${srcdir}/teshsuite/simdag/platforms/test_of_is_router.xml "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Switching to the L07 model to handle parallel tasks.
diff --git a/teshsuite/surf/lmm_usage/lmm_usage.tesh b/teshsuite/surf/lmm_usage/lmm_usage.tesh
index 377da7a4d8..2a98cd44c3 100644
--- a/teshsuite/surf/lmm_usage/lmm_usage.tesh
+++ b/teshsuite/surf/lmm_usage/lmm_usage.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/lmm_usage
 > [0.000000] [surf_test/INFO] ***** Test 1 (Max-Min)
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh
index 28f464b9c7..dbc5167223 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! timeout 300
 ! expect return 0
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
index dc7003e2d4..74c61400b7 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! timeout 50
 ! expect return 0
diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
index 9a08f2cfdd..30ccb1536b 100644
--- a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
+++ b/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 ! timeout 10
 ! expect return 0
diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index c1b1e0773d..d9f1ca2746 100644
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${platfdir}/two_hosts_platform_with_availability.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
diff --git a/teshsuite/surf/surf_usage2/surf_usage2.tesh b/teshsuite/surf/surf_usage2/surf_usage2.tesh
index 34313334ab..26ed8c79fb 100644
--- a/teshsuite/surf/surf_usage2/surf_usage2.tesh
+++ b/teshsuite/surf/surf_usage2/surf_usage2.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ${platfdir}/two_hosts_platform_with_availability.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
diff --git a/teshsuite/xbt/log_usage/log_usage.tesh b/teshsuite/xbt/log_usage/log_usage.tesh
index eace392653..6e56862dab 100644
--- a/teshsuite/xbt/log_usage/log_usage.tesh
+++ b/teshsuite/xbt/log_usage/log_usage.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Check different log thresholds
 $ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
diff --git a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh
index bbfa13a92d..c9f7f1e474 100644
--- a/teshsuite/xbt/log_usage/log_usage_ndebug.tesh
+++ b/teshsuite/xbt/log_usage/log_usage_ndebug.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/log_usage "--log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n"
 > [  0.000000] [0:maestro@] Test with the settings ''
diff --git a/teshsuite/xbt/parmap_bench/parmap_bench.tesh b/teshsuite/xbt/parmap_bench/parmap_bench.tesh
index ebd0bf93b4..f08a8e34fd 100644
--- a/teshsuite/xbt/parmap_bench/parmap_bench.tesh
+++ b/teshsuite/xbt/parmap_bench/parmap_bench.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ $SG_TEST_EXENV ${bindir:=.}/parmap_bench
 >
diff --git a/tools/graphicator/graphicator.tesh b/tools/graphicator/graphicator.tesh
index 2096fcbe76..eec5619cd2 100644
--- a/tools/graphicator/graphicator.tesh
+++ b/tools/graphicator/graphicator.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 $ ${bindir:=.}/graphicator ${srcdir:=.}/teshsuite/simdag/platforms/one_cluster.xml --cfg=tracing:yes --cfg=tracing/platform:yes test.dot
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
diff --git a/tools/tesh/IO-bigsize.tesh b/tools/tesh/IO-bigsize.tesh
index f6e79f9e06..926f53c028 100644
--- a/tools/tesh/IO-bigsize.tesh
+++ b/tools/tesh/IO-bigsize.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite contains two tests:
 #  The first one uses a very big input (150k) to check whether trucated input do work.
 #  The second one uses both a big input and a big output (150k each).
diff --git a/tools/tesh/basic.tesh b/tools/tesh/basic.tesh
index db3d8f7e1e..90fb2101a3 100644
--- a/tools/tesh/basic.tesh
+++ b/tools/tesh/basic.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This is a basic test
 
diff --git a/tools/tesh/bg-basic.tesh b/tools/tesh/bg-basic.tesh
index 9889856766..0bea621b5d 100644
--- a/tools/tesh/bg-basic.tesh
+++ b/tools/tesh/bg-basic.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This is a basic test
 
diff --git a/tools/tesh/bg-set-signal.tesh b/tools/tesh/bg-set-signal.tesh
index 77adcadc72..10011839bf 100644
--- a/tools/tesh/bg-set-signal.tesh
+++ b/tools/tesh/bg-set-signal.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite builds and uses a program raising a segfault, ie a program dying
 # of SIGSEV. tesh must detect this condition and report the issue.
 
diff --git a/tools/tesh/catch-return.tesh b/tools/tesh/catch-return.tesh
index b72c2d8c7b..69f6f8f5b2 100644
--- a/tools/tesh/catch-return.tesh
+++ b/tools/tesh/catch-return.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite builds and uses a program returning 1.
 # tesh must detect this condition and report the issue.
 
diff --git a/tools/tesh/catch-signal.tesh b/tools/tesh/catch-signal.tesh
index 49a54c6cbb..2799b4f0d9 100644
--- a/tools/tesh/catch-signal.tesh
+++ b/tools/tesh/catch-signal.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite builds and uses a program raising a segfault, ie a program dying
 # of SIGSEV. tesh must detect this condition and report the issue.
 
diff --git a/tools/tesh/catch-timeout.tesh b/tools/tesh/catch-timeout.tesh
index 5cde56c2d3..0bee596746 100644
--- a/tools/tesh/catch-timeout.tesh
+++ b/tools/tesh/catch-timeout.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 # This suite must be functional because we changed the timeout value to 10
 # before sleeping 6 secs.
diff --git a/tools/tesh/catch-wrong-output.tesh b/tools/tesh/catch-wrong-output.tesh
index 05ccc57ef0..08cfa6c3bf 100644
--- a/tools/tesh/catch-wrong-output.tesh
+++ b/tools/tesh/catch-wrong-output.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This tests whether TESH detects wrong outputs
 
diff --git a/tools/tesh/cd.tesh b/tools/tesh/cd.tesh
index f043014767..cca9dad7f6 100644
--- a/tools/tesh/cd.tesh
+++ b/tools/tesh/cd.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 # This example uses the cd command
 
diff --git a/tools/tesh/generate_tesh b/tools/tesh/generate_tesh
index af5b032c65..5306bf714b 100755
--- a/tools/tesh/generate_tesh
+++ b/tools/tesh/generate_tesh
@@ -5,7 +5,7 @@ command="$1"
 output=$(sh -c "$command" 2>&1)
 return=$?
 
-tesh="#! ./tesh
+tesh="#!/usr/bin/env tesh
 
 ! expect return $return
 $ $command
diff --git a/tools/tesh/set-output-ignore.tesh b/tools/tesh/set-output-ignore.tesh
index 04da086a7a..259421ddc9 100644
--- a/tools/tesh/set-output-ignore.tesh
+++ b/tools/tesh/set-output-ignore.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This tests whether TESH accepts to ignore command output
 
diff --git a/tools/tesh/set-output-sort.tesh b/tools/tesh/set-output-sort.tesh
index 0e871aacd1..d1d3cde689 100644
--- a/tools/tesh/set-output-sort.tesh
+++ b/tools/tesh/set-output-sort.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p This tests whether TESH correctly sorts command output
 
diff --git a/tools/tesh/set-return.tesh b/tools/tesh/set-return.tesh
index 4ff56982dc..04d71c3646 100644
--- a/tools/tesh/set-return.tesh
+++ b/tools/tesh/set-return.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite builds and uses a program returning 1.
 # tesh is instructed of this return code and must not whine.
 
diff --git a/tools/tesh/set-timeout.tesh b/tools/tesh/set-timeout.tesh
index 1ba153f70a..9cb0e99cdc 100644
--- a/tools/tesh/set-timeout.tesh
+++ b/tools/tesh/set-timeout.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 # This suite must be functional because we changed the timeout value to 10
 # before sleeping 6 secs.
diff --git a/tools/tesh/setenv.tesh b/tools/tesh/setenv.tesh
index d5963757b3..81319826e7 100644
--- a/tools/tesh/setenv.tesh
+++ b/tools/tesh/setenv.tesh
@@ -1,4 +1,4 @@
-#! ./tesh
+#!/usr/bin/env tesh
 # This suite builds and uses a program returning 1.
 # tesh is instructed of this return code and must not whine.