diff --git a/testsuite/expect/driveregress.py b/testsuite/expect/driveregress.py
index 67f6f7679cfc7f4cd178e90d617081ae1db0da6c..d1b1187d1d2348410b2a548502199472e5fb86d8 100755
--- a/testsuite/expect/driveregress.py
+++ b/testsuite/expect/driveregress.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
############################################################################
# Copyright (C) 2011-2013 SchedMD LLC
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index a6060d4077801a8fa18a02a8b735a81fe8ce9a0a..28c0411803c1bdae5acc54e44426f06d88740fd5 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Establish global state information for SLURM test suite
#
diff --git a/testsuite/expect/globals_accounting b/testsuite/expect/globals_accounting
index c41f9e0478fe1bd48248034e0040e71fa4e9912a..27a1bc5a3e7906473d0af295eb5618352609da51 100644
--- a/testsuite/expect/globals_accounting
+++ b/testsuite/expect/globals_accounting
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Establish global state information for SLURM accounting tests
#
diff --git a/testsuite/expect/inc12.3.1 b/testsuite/expect/inc12.3.1
index c1367514101a4e578a6bab61c21e1d6e956a7bbd..bb514f98372acdffebbd8fa7c485250d59406eca 100644
--- a/testsuite/expect/inc12.3.1
+++ b/testsuite/expect/inc12.3.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test for accounting records of specific job names with their ID
############################################################################
diff --git a/testsuite/expect/inc12.3.2 b/testsuite/expect/inc12.3.2
index e2be76ca412994bf46a13921d87b79cd48ff89d0..e427b2e7544c13910e4c011a2a63c5d9ffed9c07 100755
--- a/testsuite/expect/inc12.3.2
+++ b/testsuite/expect/inc12.3.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test for accounting records of specific jobs on specific nodes
# This is a sub-test of test12.3
diff --git a/testsuite/expect/inc22.1.1 b/testsuite/expect/inc22.1.1
index 5a9b970262f2ddf7b3586fd8489f3a94c29d792c..050c2c16f211399e3c9f5c813c89c28a54e31870 100644
--- a/testsuite/expect/inc22.1.1
+++ b/testsuite/expect/inc22.1.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Use sreport to get cluster usage for the first hour from
diff --git a/testsuite/expect/inc22.1.2 b/testsuite/expect/inc22.1.2
index 3c5ddc268982f995c656011ad73656d6598f9638..657f887b644b42f9a0a5580521e808f7578fc1a8 100644
--- a/testsuite/expect/inc22.1.2
+++ b/testsuite/expect/inc22.1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Use sreport to get cluster usage for the second hour from
diff --git a/testsuite/expect/inc22.1.3 b/testsuite/expect/inc22.1.3
index fd8e7c480dc0414d671b532da567b116ae571f55..0b9740a9fc8ed514abbbc7b9aff90fb66a5ab54a 100644
--- a/testsuite/expect/inc22.1.3
+++ b/testsuite/expect/inc22.1.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Use sreport to get cluster usage for the first 3 days from
diff --git a/testsuite/expect/inc22.1.4 b/testsuite/expect/inc22.1.4
index 841ab3316272de0dd262a76fcecdffaaf68a3f93..49ea6fde09f0e233319c6c02c0e2179cfbf84c61 100644
--- a/testsuite/expect/inc22.1.4
+++ b/testsuite/expect/inc22.1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for jobs that ran on a node at a certain time from
diff --git a/testsuite/expect/regression b/testsuite/expect/regression
index 65cab379a63f6e4374aa59c36b3ce9902f221184..ea5e3952b00dfc650b3630de869e3fcc3fa0c11a 100755
--- a/testsuite/expect/regression
+++ b/testsuite/expect/regression
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
############################################################################
# Purpose: Test of SLURM functionality
# Executes the full battery of tests.
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 83565e1e94ba6a4c3490c7bf1c59f10260111e33..584d1f64a4115210af00b58bc1c4754fbe56fbd1 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes as the appropriate user and group.
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index dfd49f5d2bcaceca3131808ceb815689bb3cab1f..6971820ee3da8cfe85cc9b1dc1f52e1dd85057a4 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun/slurmd debug mode (-d option).
diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index 42a21513a93b5cd571561b9e9e9cd2105cc9b7dc..b50c133e6fba98e62f1bbba1c30010635f02e891 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of batch job and job name options (--batch and --job-name
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index 7df743cd1171d5bd4373eb7d92a90c63e947db08..b29dde61e4b23b63c3d29167998c38535d3b8ddc 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --checkpoint option. This does not validate the
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 67845aa0148efea9e0c2b89a7078f2fd3ebea7e3..72c21fb601568467c884cd97fe79e461fb4964e7 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of immediate allocation option (--immediate option).
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index 04ad7cd78733a046a96f116ef6860d798b5f933f..36170bad59aae4ff98e058e3c920cd624bb555c0 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test exclusive resource allocation for a step (--exclusive option).
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index d2366661a7a2f45f59c865f98f32b6e7a1c5eb31..a9328d8c175f9b8b3b7f81f19c3f4a880279c7df 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of wait option (--wait option).
diff --git a/testsuite/expect/test1.15.bash b/testsuite/expect/test1.15.bash
index de71aeef4b0ceea682724cefca6583bfa935b220..623ce060b16488ab76876682bea09f180bb62248 100755
--- a/testsuite/expect/test1.15.bash
+++ b/testsuite/expect/test1.15.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [[ -z "$SLURM_PROCID" ]]
then exit
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index 0bef7dcddcd2a9005df0731ab4c6712a72f333ae..e437d3d3e90a671d59b4f3c0bf874394555af57f 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun buffering can be disabled (--unbuffered option).
diff --git a/testsuite/expect/test1.17 b/testsuite/expect/test1.17
index 0ee91c33918f67405f9927b14efd86e5e2148767..4d5e3386ecf392e42b89aa54ad2673cc2cb8de0a 100755
--- a/testsuite/expect/test1.17
+++ b/testsuite/expect/test1.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun --open-mode (truncate or append) option.
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index e84e30866916bd9ae10b75557e0c240fa1ec4a78..b7afa5781e30543d336bdf6c1704d617e9aacd11 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --licenses option
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 7a8ed4d13a7941f57aa1856bd4e9c407dcee2714..7094322af122445bb31d571012916400a72c64a2 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test srun stdout/err file name formatting (--output and --error
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index ec226ede136ad64da99fee329f6bb4b80b2fb448..5dd0fb127a17e197031a1046c4d8e9d7326267e8 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the proper task count (--nprocs
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 64835bf6e81dca33340cdc8ad9fe0fb90e61e30c..2b688c1f32ad801fb0aac17b0ebcfc3c28592d30 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test srun stdout/err disabling (--output and --error options with
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 918bb269f03739fbd67635abd83dd74bb97b0f95..d7e112adb8f302174a397a8cad9e55aa1539d82d 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test srun stdin/out routing with specific task number (--input
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index 68f2127e4bf1bcaaced5929ee9f7203eca79327e..46dd850d8ea190fc25bd5753e515eab919eb2a78 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with various launch thread fanouts
diff --git a/testsuite/expect/test1.23 b/testsuite/expect/test1.23
index 90ba1828a2d1cc810a127eed008be28023b57838..de53b7f76c262188f847019843dc4880d534b41b 100755
--- a/testsuite/expect/test1.23
+++ b/testsuite/expect/test1.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify node configuration specification (--mem, --mincpus, and
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index 5b8384d1333fd2e816412a886f2ea4d8a2b4c44d..114d7c5b21f29fb63a2577b09b5d6b11247cfcb7 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify node configuration specification (--constraint option).
diff --git a/testsuite/expect/test1.25 b/testsuite/expect/test1.25
index 3722d80b35b858c21556bd39508e07ae59204458..ca6243bcdcd26661453fcde4793d368f5b3c0df1 100755
--- a/testsuite/expect/test1.25
+++ b/testsuite/expect/test1.25
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Submit job to not be killed on node failure (--no-kill option).
diff --git a/testsuite/expect/test1.26 b/testsuite/expect/test1.26
index 81d06bddd3e07e38a978539a541d949d435397ae..3726a387dffb8a63b926bd0cde3f76cc6833d5bc 100755
--- a/testsuite/expect/test1.26
+++ b/testsuite/expect/test1.26
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Submit job directly to slurmd without use of slurmctld scheduler.
diff --git a/testsuite/expect/test1.27 b/testsuite/expect/test1.27
index 34e7472f2270427b2be6e184fbb197fb13ce02e3..9fc179ce8bbc0d9fac11f84894f2b10a3cf373ea 100755
--- a/testsuite/expect/test1.27
+++ b/testsuite/expect/test1.27
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify the appropriate job environment variables are set.
diff --git a/testsuite/expect/test1.28 b/testsuite/expect/test1.28
index cd906d2de68b510ef656caac7449c5e76064815a..7b888a71d22c314ec15ecb932adb81e79d2a6c54 100755
--- a/testsuite/expect/test1.28
+++ b/testsuite/expect/test1.28
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that user environment variables are propagated to the job.
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index 82fbb8b8c6a0e6961dafefa4bd5e25ef7befab84..f5d223d031400c8b0cd2a3be2e5a7ab5f305538f 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that user user limits are propagated to the job.
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index ef6c301c4026cba5e49c095b3e5a224f0b40a744..5d0afbf49f68486c16115b01634fc5b1a3786ce8 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun reports a proper version number (-V option).
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 66fc27b47a01500cfb789c12c22f0466b57351f6..ad4fa143b64c0d97aa05e28e511e5ad0488abc58 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of increasing job sizes
diff --git a/testsuite/expect/test1.31 b/testsuite/expect/test1.31
index 87fa77733ebafc8e8508ab9bc47ca4b4b40b3d01..04d04d7f83a0628ecda1e86fed20a9c8c9c99213 100755
--- a/testsuite/expect/test1.31
+++ b/testsuite/expect/test1.31
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that SLURM directed environment variables are processed:
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index 4393ebee4fcca018f583ff137f0c1b1169db5b72..90f6479990961fe10f6be197c3c4387d723f4a6a 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun signal forwarding
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 2880f894dc18841991efa0ebc861a0262091518e..cecfcfcf6343010280b926bd76c952cef48baae9 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun exit code reporting
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index b33805154193d85aded34d68b9f733b5e8194c58..9c885740997bcfacf9a598929eeed0ba66edde69 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of task signal abort message
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index bd2711f5f0c1d276113e5f2c945d476f27e4019b..070b947d6d9f2145fc78d8c877c72f626af00c91 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of batch job with multiple concurrent job steps
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index f47c249a9137bfc78fe92e7bb014a0a746c9fd4c..92e84db8c3a0be7f27ae74533733228721e8c258 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test parallel launch of srun (e.g. "srun srun id")
diff --git a/testsuite/expect/test1.37 b/testsuite/expect/test1.37
index 616190fcb31969e00d43043b433845315823513e..6904be801a0e0bc2c8f7b6963971c977ee68d59f 100755
--- a/testsuite/expect/test1.37
+++ b/testsuite/expect/test1.37
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --tasks-per-node option.
diff --git a/testsuite/expect/test1.38 b/testsuite/expect/test1.38
index d5dcfabb94e2fe9d05d1a3b4e10acf218dd6da11..64b5ef3258f000e96e744526fc92908adcf27014 100755
--- a/testsuite/expect/test1.38
+++ b/testsuite/expect/test1.38
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test srun handling of SIGINT to get task status or kill the job
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index 59613b78e333291e4e89aec5fae80f520b6b59e3..97b069f19e4534e929ef4eb3d3f768ad782bd9b4 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun usage option works (--usage option).
diff --git a/testsuite/expect/test1.40 b/testsuite/expect/test1.40
index 90645494b287e9a17b3bcd725ec4105f49942ef5..3f64b06717f98b4a0f5e6f20b8282c1dbd4013eb 100755
--- a/testsuite/expect/test1.40
+++ b/testsuite/expect/test1.40
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job account (--account option).
diff --git a/testsuite/expect/test1.41 b/testsuite/expect/test1.41
index 3fcac47477c1fc72b1dbe8081feaddcf2340bd91..a596a3fafab2c49a5d729d6252908e517aaaa06f 100755
--- a/testsuite/expect/test1.41
+++ b/testsuite/expect/test1.41
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate SLURM debugger infrastructure (--debugger-test option).
diff --git a/testsuite/expect/test1.42 b/testsuite/expect/test1.42
index b975b997d16d111d401726966dfdbe1df193f9f1..bc7c5f4765058e10307344f03c8c4ac303e6510e 100755
--- a/testsuite/expect/test1.42
+++ b/testsuite/expect/test1.42
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job dependencies (--dependency option).
diff --git a/testsuite/expect/test1.43 b/testsuite/expect/test1.43
index 8b3aeaa0fbf429b7c36e32055afbc2c5096d1da2..50177be27739c005bfbe3d551bbf4f92999c38bf 100755
--- a/testsuite/expect/test1.43
+++ b/testsuite/expect/test1.43
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of slurm_job_will_run API, (srun --test-only option).
diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44
index a127fbe6710a93a041007cc0250ec087bbce33e3..a9bce3a59a3f70fd99bf8b0c1cee2cab189682d2 100755
--- a/testsuite/expect/test1.44
+++ b/testsuite/expect/test1.44
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Run "srun cat" and read srun's stdout SLOWLY, creating
# stdout back pressure in srun. (srun used to lose data on stdout
diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45
index 803eb462049bab8c1888e802eb04aea0d03c7e8e..282854f16d3c694c5718651beda110a44ccb2073 100755
--- a/testsuite/expect/test1.45
+++ b/testsuite/expect/test1.45
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that a job correctly uses the -E or --preserve-env flag.
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index 9fe5380643be63f8c7c2b6fa6c8f92c485ee19de..90921df9c75cf39ab7e8e4c16e4373d347ff6b57 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun's --kill-on-bad-exit option.
diff --git a/testsuite/expect/test1.47 b/testsuite/expect/test1.47
index aa6aa9091dffd0cd72e7f11465fb08176dd917da..f5d0f4bca16f6ab2368386d7b0d850febcfffea7 100755
--- a/testsuite/expect/test1.47
+++ b/testsuite/expect/test1.47
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job dependencies with singleton parameter.
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index 933b019e0a86e2ae002391588de5c0b64334078c..f2664063bf5afd73fef570abf2824cf8158d085a 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of mail options (--mail-type and --mail-user options).
diff --git a/testsuite/expect/test1.49 b/testsuite/expect/test1.49
index d8898111f903dafdf002f2dd6004962a9821ffbf..1d16e107f4a4b5449c9d9cc3aad53687dd22b766 100755
--- a/testsuite/expect/test1.49
+++ b/testsuite/expect/test1.49
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun task-prolog and task-epilog option.
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index 130fd97bb7a168880a79cbb7ee0c26fb69fe6a28..74545e89c7425821782d1a9fbf0fd12c140f4978 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun help option works (--help option).
diff --git a/testsuite/expect/test1.50 b/testsuite/expect/test1.50
index 0fa6dbda9b597a5e987ebf0c510c1d1c2603f076..22611dcc99c5ac8b9b6c514664d4e104a5a5979e 100755
--- a/testsuite/expect/test1.50
+++ b/testsuite/expect/test1.50
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of running non-existant job, confirm timely termination.
diff --git a/testsuite/expect/test1.51 b/testsuite/expect/test1.51
index a30c381f0d50ee4c1b9bfeef56566c7fa9377da1..b4981fc254a1dcb011ad6507472f6261f5645d89 100755
--- a/testsuite/expect/test1.51
+++ b/testsuite/expect/test1.51
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test propagation of umask to spawned tasks.
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index fdb974711ba78761ce08f3b55bd89fc070e1f715..e57a42d5240a0674336546b48d0b8d3266db9efe 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of srun functionality
# Test of hostfile option (-hostfile).
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index 7a6e930af37129e030e380e562396c79b4668f94..6de985114e36e83644d6da33dc48b52a6f30bf9b 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --signal option.
diff --git a/testsuite/expect/test1.54 b/testsuite/expect/test1.54
index 6878e94f5f331f67f99aa74eed8acd182c559c96..1c5929c9f20ff99e29473e71a90662ada5e89ac3 100755
--- a/testsuite/expect/test1.54
+++ b/testsuite/expect/test1.54
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of MPMD (--multi-prog option).
diff --git a/testsuite/expect/test1.55 b/testsuite/expect/test1.55
index e9022cb9d4dda04a89196e37aecc190f7ce5d46d..108b0c037c4ed57289cf4396f1353d6008f5beae 100755
--- a/testsuite/expect/test1.55
+++ b/testsuite/expect/test1.55
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify srun behaves when its controlling terminal disappears.
diff --git a/testsuite/expect/test1.56 b/testsuite/expect/test1.56
index 39919a5219f43ba83a2fce140f8d926db3c705bf..4fae87bff9ccfc9132b00f840e7de17015b0c9e6 100755
--- a/testsuite/expect/test1.56
+++ b/testsuite/expect/test1.56
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test buffered standard IO with really long lines
diff --git a/testsuite/expect/test1.57 b/testsuite/expect/test1.57
index accd2d7e16bcb2ee55b9dd057f7e4960533afb01..08ca4256243eac4844567113a4a8123ec7f3a264 100755
--- a/testsuite/expect/test1.57
+++ b/testsuite/expect/test1.57
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --jobid option (used by Moab)
diff --git a/testsuite/expect/test1.58 b/testsuite/expect/test1.58
index df814fb78c0dcf3f2a072d88750f23b9d00ccecb..9785a00d38192b3de38d889e83affa08546d6a96 100755
--- a/testsuite/expect/test1.58
+++ b/testsuite/expect/test1.58
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun --jobid option with an existing allocation
diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index 6926c25e68de074e176e6bda0e9d627ae4121419..5cad9feec7287b1f439b04988e0850176b51703d 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of srun functionality
# Test of hostfile option (-hostfile) inside of an allocation.
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 9a228b9ec4e66c4216f49e407659764610b6c70b..0e13520fd6dec65260090bd4bd808180bff2ed97 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun sets appropriate working directory (--chdir option).
diff --git a/testsuite/expect/test1.60 b/testsuite/expect/test1.60
index 0a698bbf2eac65e61acac4c7a4516f12d7a5815c..de0c0a3860b54325097e244d4c2ca6001c514804 100755
--- a/testsuite/expect/test1.60
+++ b/testsuite/expect/test1.60
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test srun stdout/err labelling combined with file template
diff --git a/testsuite/expect/test1.61 b/testsuite/expect/test1.61
index a34f242794eb295ce705b37b29900ec25bc6689a..2b1f74d44f01d93abb5399050e451e7fc9a17e7c 100755
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# test to verify job step time limit
diff --git a/testsuite/expect/test1.62 b/testsuite/expect/test1.62
index 23a1901454b19be400fcde9ec6cc3e16306e61be..d8026b871cf986fcb5729ea4054570a2ff613589 100755
--- a/testsuite/expect/test1.62
+++ b/testsuite/expect/test1.62
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of gres/gpu plugin (if configured).
diff --git a/testsuite/expect/test1.62.bash b/testsuite/expect/test1.62.bash
index 50e9ee88a1848bf9ca588355fe04bfea6698043c..1f0c1a9053b260c273f17059c9e634d823b54339 100755
--- a/testsuite/expect/test1.62.bash
+++ b/testsuite/expect/test1.62.bash
@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
echo CUDA_VISIBLE_DEVICES=$CUDA_VISIBLE_DEVICES
diff --git a/testsuite/expect/test1.63 b/testsuite/expect/test1.63
index 6d3cf26782c8dddd78a6fa592836b9f24d4b488f..bc47cfb1a90d7de3ca28e12a3b88dc716238f1cb 100755
--- a/testsuite/expect/test1.63
+++ b/testsuite/expect/test1.63
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun --disbale-status/-X option, SIGINT to be sent to tasks.
diff --git a/testsuite/expect/test1.64 b/testsuite/expect/test1.64
index 63ee4abf83d84c0e647856bb0e950489a74c4ea8..5ccf8df4b10ff6e12d262e173166f7d944c96ed2 100755
--- a/testsuite/expect/test1.64
+++ b/testsuite/expect/test1.64
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test interuption of srun while waiting for resource allocation.
diff --git a/testsuite/expect/test1.65 b/testsuite/expect/test1.65
index 24e1be24a900ec267371b8fdc276d10f2dfc1311..09244e3c3bec43dae188395496edd6ac90b4cbe3 100755
--- a/testsuite/expect/test1.65
+++ b/testsuite/expect/test1.65
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun --mpi=list option.
diff --git a/testsuite/expect/test1.66 b/testsuite/expect/test1.66
index fb1f1ee512014df7d08558e5955a63e59de62470..70b75ad854822af156c8a2fd0c85394f18a3a2d9 100755
--- a/testsuite/expect/test1.66
+++ b/testsuite/expect/test1.66
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# srun to make sure that the jobs are running on the correct
diff --git a/testsuite/expect/test1.67 b/testsuite/expect/test1.67
index 531d1f14e0037196ee76a73066ed11d95ee1014b..452d3ce275a31b8bf0a11cbb517b6e13c0c7dd6c 100755
--- a/testsuite/expect/test1.67
+++ b/testsuite/expect/test1.67
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that an srun program can move from the background to the
diff --git a/testsuite/expect/test1.68 b/testsuite/expect/test1.68
index 5b1c7823616876ac2e37c4c08d2de1c1d7cde501..9214a2894a2f804a83bb13423062dd161b143706 100755
--- a/testsuite/expect/test1.68
+++ b/testsuite/expect/test1.68
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that an srun program can move from the foreground to the
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index 58ce0772010ea4058fc44501c38dc0236540920a..c4e1856c7c0edde7d2ee5f5807fa362d2104256e 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that multiple srun programs execute simultaneously in the
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index 1c4861fe9dd0115991613623d47780f5091442e0..2fb3b740323b3c70f20dd76a838136da43f2cb1c 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that job time limit function works (-t option).
diff --git a/testsuite/expect/test1.70 b/testsuite/expect/test1.70
index 8f341404fc84b4f3bea5150047010e9b0d951c81..c83e51b8b1347bbe304cbfc0ba7d4ee03ff2a9f3 100755
--- a/testsuite/expect/test1.70
+++ b/testsuite/expect/test1.70
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validates that srun standard input and output work
diff --git a/testsuite/expect/test1.71 b/testsuite/expect/test1.71
index fbd4017681d10a1be8a12e9589d210499beeddf2..3418432ff1ca418ab606e8083e90d2481474ac65 100755
--- a/testsuite/expect/test1.71
+++ b/testsuite/expect/test1.71
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validates that srun exit code matches that of a test program
diff --git a/testsuite/expect/test1.72 b/testsuite/expect/test1.72
index d21e9fa4ad1c416dd31f7653d1780324eed63fe1..d4460d583a4749a4df464a61cbd359b29713c325 100755
--- a/testsuite/expect/test1.72
+++ b/testsuite/expect/test1.72
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that the JobAcctGatherFrequency value is enforced
diff --git a/testsuite/expect/test1.73 b/testsuite/expect/test1.73
index 89d0a8085321816406f91b7922dffe5a7e89070a..ad667032ce65cc3e4aae09859a746c1b98acc520 100755
--- a/testsuite/expect/test1.73
+++ b/testsuite/expect/test1.73
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that the OverTimeLimit value set in the
diff --git a/testsuite/expect/test1.74 b/testsuite/expect/test1.74
index 007accfe9065fb88ecfd9ac640a27f5eec4b0ad4..a15af6776cd6f0e59a87c8cd12e04dade8528154 100755
--- a/testsuite/expect/test1.74
+++ b/testsuite/expect/test1.74
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that srun -N uses the MaxNode and GrpNode limit in
diff --git a/testsuite/expect/test1.75 b/testsuite/expect/test1.75
index 459e4dc160e2db6bb7d69d4d9bb0adc0388ac214..83aa246aebccfc673a2a031cb28c33b1b7ac2605 100755
--- a/testsuite/expect/test1.75
+++ b/testsuite/expect/test1.75
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate --cpu-freq is enforced when using non-numeric values
diff --git a/testsuite/expect/test1.8 b/testsuite/expect/test1.8
index 6ea14aad9e6e104c77a4350841ba4dd0b3084610..7391449526522b4bfa9464f99f25ab21a328cec1 100755
--- a/testsuite/expect/test1.8
+++ b/testsuite/expect/test1.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that srun stdin, stdout, and stderr options work (--input,
diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index f9564cc0fd024112c4295f513f80d40d484d581f..04bc47e68af306d52516317d91d17e0860b9b9ea 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the proper task distribution
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index 201fbc4b0688a164b0cdae53f960c731f43c4af8..198c180daa8433c92f1a8844614f79f61f17e381 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the proper node count
diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index c13fe9a1b07f5c01f080c01ffdb4975b899a6e67..be59f1d1be774e94db4c5391a3ac61f7e0101739 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the specified nodes
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index 31abc87921d79a8d5daf7a8e7a1e377f4f7f46d7..bec1704beb8ff7ce48ac04fa4be73486da336848 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of contiguous option with multiple nodes (--contiguous option).
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index b5cc3cf855c2c36f4dee664abb6910287dc9560f..0d909a5c3ee4f06d9cdad9e3fb0b7417c4c8b57c 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of cpus-per-task option on a single node (--cpus-per-task
diff --git a/testsuite/expect/test1.85 b/testsuite/expect/test1.85
index 26a96bbc26d4850504d1fec98e2f3464a8d9a088..61a857e71f90b953cbfdc4b64d26306f781883d8 100755
--- a/testsuite/expect/test1.85
+++ b/testsuite/expect/test1.85
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of node selection from within a job step on existing allocation
@@ -32,7 +32,7 @@
# You should have received a copy of the GNU General Public License along
# with SLURM; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#############################################################################!/usr/bin/expect
+############################################################################
source ./globals
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index 34fa8cea01c9745608be5cf80bd3e0ebf267b526..2c243b166066a4c9b27d05e3cb8f8285519156ee 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm node selection from within a job step on existing allocation
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index cba6780e541544dc79a8cbc935a781b3a42b7f12..7ceb330745371fc062ad4201be7be5e66b1c83b3 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm node selection from within a job step on existing allocation
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index 4eb46ab31e4176388f471ad837034a86b34154d8..d6a47333fe324fb5cddc63151333bab8093b3bd1 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Basic test of MPI functionality via srun
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index b9fa4e7e5a5c4127918cf3fc212fbcba9069324e..65399f3430147fd137f7a7c3fd9f3a40b942221a 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of CPU affinity support.
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 4c435d14ca3ceba85659d606c53b437c8fb9fa23..6b0f82997bece04e0914ce63a221c698946c303c 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun verbose mode (-v option).
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index b9d5c09dbcd5a775cdfb8dfb876634dcda4f5b9c..7993c3a0910ca4bdeb564d24df2c1d227a279d29 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of memory affinity support for NUMA systems.
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index 0de1d9cbddfebe26955a0330662684fc53ae68b9..8acac4189e292d053b4242914435a217e2eaad9a 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of CPU affinity support for multi-core systems.
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 18c982e835827b1568311a352bb624dcbab74e1a..b7499bffdc59cce62a8df8eb60c5c66ad34e7da2 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of task distribution support on multi-core systems.
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index 2ba42457b37e3237c4b3a9fe45ec4c05fde44ea8..c39e7d481ebfe3747a8393ed6f91de3d657d7925 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of LAM-MPI functionality
diff --git a/testsuite/expect/test1.94 b/testsuite/expect/test1.94
index 91bdad3fbc18bc6d71541e464527c5f2f034851c..204c3b6e78227f46caa8a43a7cc09cd8e44101c0 100755
--- a/testsuite/expect/test1.94
+++ b/testsuite/expect/test1.94
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of MPICH2 task spawn logic
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 2b10fde7f6f176e76f3cd2c79155ae0662a5f662..0eee2e516f60378964667c643d268ef4fdd6adc1 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Basic UPC (Unified Parallel C) test via srun.
diff --git a/testsuite/expect/test1.96 b/testsuite/expect/test1.96
index cfc2fa7598802a1914cc23e3f4459dc9350a34c1..4c6114fb4ec8b919125dad864c7a348c0790219e 100755
--- a/testsuite/expect/test1.96
+++ b/testsuite/expect/test1.96
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Basic SHMEM test via srun.
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index 6e18e3dd1d0396e47baf1690ab8598bcc0907a11..5585a42341ff9b1fe65069bfce5bc3223fd35d96 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test options --ntask-per-node and -c are enforced
diff --git a/testsuite/expect/test1.99 b/testsuite/expect/test1.99
index c74bf54572dbf8c9f6275f98ff40c8d00ab9518a..699eab7fca5364f34b4a28a6c46c01a7785ede23 100755
--- a/testsuite/expect/test1.99
+++ b/testsuite/expect/test1.99
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that the SrunPortRange is enforced when starting
diff --git a/testsuite/expect/test10.1 b/testsuite/expect/test10.1
index 3b90de64ba2cafbcd52b00cb90c989c5682dd244..d68c432bbd24df8d2075c3df857a4db5aad7e376 100755
--- a/testsuite/expect/test10.1
+++ b/testsuite/expect/test10.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that smap usage option works (--usage option).
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index 2fe3ff1787ece1df22f4226aa227af1137a3dd75..072b05c8ad9b0e52466c7330e188cf6f9e8cc38a 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check --noheader option in smap in curses mode
diff --git a/testsuite/expect/test10.11 b/testsuite/expect/test10.11
index ffead530127d648d51a5c80abae2c4f751d9e9f9..a91bb9ea9f53ae43eee3734353ed02e30db04f47 100755
--- a/testsuite/expect/test10.11
+++ b/testsuite/expect/test10.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that smap reports a proper version number (--version option).
diff --git a/testsuite/expect/test10.12 b/testsuite/expect/test10.12
index 34a2ba68a640b778ea194c3ec8098d5e49e1e027..d9a10fb98cb0ee43cb4268af17ea273092e8bc10 100755
--- a/testsuite/expect/test10.12
+++ b/testsuite/expect/test10.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that smap --resolve will work on SN (--resolve option).
diff --git a/testsuite/expect/test10.13 b/testsuite/expect/test10.13
index d1dda50ca0b662aecc3ca6c56316760f3e979b2c..973fbe297da1ad90d5b7c127ca3585f1cfac8d90 100755
--- a/testsuite/expect/test10.13
+++ b/testsuite/expect/test10.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check bluegene.conf file creation
diff --git a/testsuite/expect/test10.2 b/testsuite/expect/test10.2
index 7b31598e30e5e123b9859819132aeb04274c5196..140e6efb23f45843910a6813777abd5887d67a65 100755
--- a/testsuite/expect/test10.2
+++ b/testsuite/expect/test10.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that smap help option works (--help option).
diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index 215c55fa82ce96b938a19332e2ea5880327e0bdd..953c9a2d8159c3c913be8eb922391f33f5e8cfcb 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check slurm partition display in smap in curses mode
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index e194364cd110e5c263bd24b08cc7b6a162c333d5..b5cafa63fa303fc972238cb2823b03a4b14a89f5 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check slurm partition display in smap in commandline mode
diff --git a/testsuite/expect/test10.5 b/testsuite/expect/test10.5
index 4043b2ce21804698b0bb1eb971f52493b8310cea..62f5bd3ccdb758a8f3e77932199bd264f76648e7 100755
--- a/testsuite/expect/test10.5
+++ b/testsuite/expect/test10.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check BG partition display in smap in curses mode
diff --git a/testsuite/expect/test10.6 b/testsuite/expect/test10.6
index 8cadfc4e39c1b3ee29d2f863a6801bda45aec418..9c6a5193383df4593830735d8ffe19e42419e0ce 100755
--- a/testsuite/expect/test10.6
+++ b/testsuite/expect/test10.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check BG partition display in smap in commandline mode
diff --git a/testsuite/expect/test10.7 b/testsuite/expect/test10.7
index ce1947b84b0574857100b429f576e8e1acb2489a..5548a715f74af71583d1998b21a35278225fe382 100755
--- a/testsuite/expect/test10.7
+++ b/testsuite/expect/test10.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check job information display in smap in curses mode
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index 4eda6812c14ae7df02996ad813fa442806866453..192ea590d5b4dc9f3e80a3629cbbf89dc14ef9f8 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check job information display in smap in commandline mode
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index cb65ba156e69957e22cfbf9572612e5a36eb2024..39851cf20886698b9cd5987c7409a9603b15be66 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check --iterate option in curses mode
diff --git a/testsuite/expect/test11.1 b/testsuite/expect/test11.1
index b044e5ef5cc4a1e451f0c9d1777892c6e34b6560..b62db119546e710c4f11cf00ebf19d8e98b2af88 100755
--- a/testsuite/expect/test11.1
+++ b/testsuite/expect/test11.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of nodes options (-nodes).
diff --git a/testsuite/expect/test11.2 b/testsuite/expect/test11.2
index b8f6039543a0c2ffd9cf53bd4c1999b10466fc0a..3fd9973bcbe354ab292f0fb2f7508ad8eeea48ae 100755
--- a/testsuite/expect/test11.2
+++ b/testsuite/expect/test11.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of Network options being set correctly.
diff --git a/testsuite/expect/test11.3 b/testsuite/expect/test11.3
index 6fad1e0059627b35af05a0951e66fb4ff552b3bc..41e5ed9ad80aa18f45c3cf31b50bb169dc3b5032 100755
--- a/testsuite/expect/test11.3
+++ b/testsuite/expect/test11.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of Network protocol being set correctly.
diff --git a/testsuite/expect/test11.4 b/testsuite/expect/test11.4
index 344a9dd6d33118018bb20c460eae4c15a98458f7..0738569d9a31525c75b15c4a9d442c156b548bfc 100755
--- a/testsuite/expect/test11.4
+++ b/testsuite/expect/test11.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of running mpi jobs
diff --git a/testsuite/expect/test11.5 b/testsuite/expect/test11.5
index 4dcc287829932168f0707b50fda2a9fdc04f2a94..41075e20be8dff95ed1ab6077f28379f266e00f0 100755
--- a/testsuite/expect/test11.5
+++ b/testsuite/expect/test11.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate checkpoint operations using srun
diff --git a/testsuite/expect/test11.6 b/testsuite/expect/test11.6
index e5976a13b0f6d534056c346f0f3ffc6ff395aba8..5dfa996ff0d5d736ed3cc94fed77991e2bc14e9d 100755
--- a/testsuite/expect/test11.6
+++ b/testsuite/expect/test11.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of checkpoint logic (with poe)
diff --git a/testsuite/expect/test11.7 b/testsuite/expect/test11.7
index 33d7d574f030b398c4ea39e10c3b3cf87950d55e..91505c5c80d7a016be911dab2d62904067341238 100755
--- a/testsuite/expect/test11.7
+++ b/testsuite/expect/test11.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of POE functionality
# Test of hostfile option (-hostfile).
diff --git a/testsuite/expect/test11.8 b/testsuite/expect/test11.8
index 337b652e4e3349d2be2159df0137c68f08208117..73b23f42504fce670dfe68f41ceb6dd2a1417ba1 100755
--- a/testsuite/expect/test11.8
+++ b/testsuite/expect/test11.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of running different executables with different arguments
diff --git a/testsuite/expect/test12.1 b/testsuite/expect/test12.1
index eeb1600e726ada409f0f1ad4e9ada64e05f85818..d82d2296098d142fd88ab752f8a5cc099867c4e4 100755
--- a/testsuite/expect/test12.1
+++ b/testsuite/expect/test12.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacct --help option.
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index 43638a41fe5bb1b077a05a5c68253be224467406..bdaf78f99e1d93ade20c741d10f012d585488ace 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacct functionality and accuracy.
diff --git a/testsuite/expect/test12.3 b/testsuite/expect/test12.3
index 61faf04f16d5771d8474d5854edebeffd8bfa1e6..5f4704d4f97846ee2347865a3e9c48e471f0b659 100755
--- a/testsuite/expect/test12.3
+++ b/testsuite/expect/test12.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacct filtering of records by account and job name.
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 76a76bb6a4a39bc0c574a4f38a1d8d98730ab23a..588eccdb82c46baa003f13fc998789414ec9ff2f 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM sacct functionality
# sacct options b, g, j, l, n, p, u, v.
diff --git a/testsuite/expect/test12.5 b/testsuite/expect/test12.5
index 68e2f8d3a41424c8b54cb8b2bac267ef352dae13..0cda2454391b3dcb17225855db6ab65b76eb010b 100755
--- a/testsuite/expect/test12.5
+++ b/testsuite/expect/test12.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacct --helpformat option.
diff --git a/testsuite/expect/test12.6 b/testsuite/expect/test12.6
index 932525a0e2866d6747c94ce48b4b6c4859091da9..3ea2d40be9840f0688a9cec3bfb61df651289223 100755
--- a/testsuite/expect/test12.6
+++ b/testsuite/expect/test12.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test hdf5 acct_gather_profile (--profile=task)
diff --git a/testsuite/expect/test12.7 b/testsuite/expect/test12.7
index a2d9ad5d2d6def4f4ebdedadb0f05e2a615702ba..76e4eb75746e1369fc047cce155320dbb8cee0a5 100755
--- a/testsuite/expect/test12.7
+++ b/testsuite/expect/test12.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that sacct -D shows correct job steps and states
diff --git a/testsuite/expect/test12.8 b/testsuite/expect/test12.8
index 8ea2984e1065e06dc8bcb5c7a4745f493aea42e3..0d650b9abe7249f92c63c02924651345d2fd7cd7 100755
--- a/testsuite/expect/test12.8
+++ b/testsuite/expect/test12.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validate that a job step will report a TIMEOUT state
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index af2928c6c14c982ac0ba4f8160072e539d14e9bd..8b213f13a8daa9898018e9cfe031a2fc6d2b9d03 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that switch windows in uses are not re-used.
diff --git a/testsuite/expect/test13.2 b/testsuite/expect/test13.2
index f847ac9f29a73949004b1b86bed391afefabe064..253bc148b0c4f756682584e6898214b1057390e6 100755
--- a/testsuite/expect/test13.2
+++ b/testsuite/expect/test13.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of NRT functionality
# Test of switch/nrt options (--network option).
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 00117b57043b1def12b23fa766bf7ee94dc496a8..3cf02b74ce472d9dd3ede08a2bf6a2104106477a 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbcast usage option works (--usage option).
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 1e14c71dbc07a7569883908cc05f60f795819e75..e1672c2efc5c225f0179ffcc07c7f9f819176dae 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbcast help option works (--help option).
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index 48e4d3eaaaa29c37db00e989df78bd4b708f67d2..86daa3f748c047430e26599aed213a0bc3f4ae7c 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbcast reports a proper version number (--version
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index ee97610f6f04f041c523b087d0b31f53a540f754..3c278d4e011aa7477b6315dbbe8f3a8e159a4cd5 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sbcast file overwrite (--force option).
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 762e60de458b9d7f2bf841413e502a57a87c6c55..52d5b09c2dfd914091859da6ff74c565d3c2adb1 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sbcast time preservation (--preserve option).
diff --git a/testsuite/expect/test14.6 b/testsuite/expect/test14.6
index 545038f5c6721f732468c18592829d5cceeddcc1..af50cb676613f025574da365376ad2bd244ab130 100755
--- a/testsuite/expect/test14.6
+++ b/testsuite/expect/test14.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sbcast logging (--verbose option).
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index 0daabec270f2cbb4237480ae6e4cd0816c3d29d6..d83b3601b901ff36631e6584d4d1d3e98f0d1d23 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sbcast security issues.
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
index be63ff808b4492e6d1447dc8265d6e50537432f8..b6572e3a59ca8c790b30c47a6aa8412a1e7513ab 100755
--- a/testsuite/expect/test14.8
+++ b/testsuite/expect/test14.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sbcast transmission buffer options (--size and
diff --git a/testsuite/expect/test14.9 b/testsuite/expect/test14.9
index 1edc59cf4c46d62d2bb74b34fc42a818123af707..6c850a7e383a8fc85a7f29cf97e0a89bb9866191 100755
--- a/testsuite/expect/test14.9
+++ b/testsuite/expect/test14.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that an sbcast credential is properly validated.
diff --git a/testsuite/expect/test15.1 b/testsuite/expect/test15.1
index dfc629f2d11c8b1190781941d1c455a9fa3a1af9..aff8ec6fd4eabcef01abe1b1cf934d12528bfd52 100755
--- a/testsuite/expect/test15.1
+++ b/testsuite/expect/test15.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that salloc usage option works (--usage option).
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index 5d21445046d9865df932a2a5651a0501857d3947..f9257d4b63143385405a79f9531ee872f6e89b4b 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job allocates the proper procesor count (--tasks)
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index 27779b9e8dc4e5b0e96cafe64f0d6134e5ffd21e..f9e65c3ae2ad77c1f28aaa364f57527467e54af4 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --nice and --job-name options.
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index 19b49a58aaed447bbee2d3d6f0962ad2fc45b82c..ed398cbaa53d2620396c4d334a75394bd7ecb683 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify node configuration specification (--constraint option).
diff --git a/testsuite/expect/test15.13 b/testsuite/expect/test15.13
index c0a4e872262e8d84483ac0ca364d111f7b7723da..ca179ea22f76327e643c1b763beeef9f5a1d903c 100755
--- a/testsuite/expect/test15.13
+++ b/testsuite/expect/test15.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify the appropriate job environment variables are set
diff --git a/testsuite/expect/test15.14 b/testsuite/expect/test15.14
index 9e345a9f762f705d2b1e249662c19f267c60ebd7..8efb34eedcd9f10bbb2f7982fab34df6545d7a53 100755
--- a/testsuite/expect/test15.14
+++ b/testsuite/expect/test15.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job dependencies (--dependency option).
diff --git a/testsuite/expect/test15.15 b/testsuite/expect/test15.15
index dbedba608795878acbe4ea30cbb8fd08ed7d5ce6..dabb8d9b361b52093a7cd359e1d3ce178450181d 100755
--- a/testsuite/expect/test15.15
+++ b/testsuite/expect/test15.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of user signal upon allocation (--bell and --no-bell options).
diff --git a/testsuite/expect/test15.16 b/testsuite/expect/test15.16
index d602865a8602fdf9c80d4f3527bd06ba50ba2c37..444d749d0a8ba2c942ef530cbe303062b845d401 100755
--- a/testsuite/expect/test15.16
+++ b/testsuite/expect/test15.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that SLURM directed environment variables are processed:
diff --git a/testsuite/expect/test15.17 b/testsuite/expect/test15.17
index c702812dd1cbc1b6f2b0e87101751092beecf087..7569d7726415d9711cfe77c0ce4e5c3b05d0dc40 100755
--- a/testsuite/expect/test15.17
+++ b/testsuite/expect/test15.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test the launch of a batch job within an existing job allocation.
diff --git a/testsuite/expect/test15.18 b/testsuite/expect/test15.18
index 6c42b1fea3634fe977066797aee89718d1b1493c..11c8dae9daa7eb951385444dd820c5769bbfb03b 100755
--- a/testsuite/expect/test15.18
+++ b/testsuite/expect/test15.18
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of running non-existant job, confirm timely termination.
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index dcbe015419e15406dffc40769bf105e149e5a27f..d658030c22703771394d6897fe2a0fac77df9ba4 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the proper node count
diff --git a/testsuite/expect/test15.2 b/testsuite/expect/test15.2
index 685557aeb54cdcfe1918a2ec72c50424ef2cf906..397ceab86e0cfb6acaf2d556a31b4abc0ce7953f 100755
--- a/testsuite/expect/test15.2
+++ b/testsuite/expect/test15.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that salloc help option works (--help option).
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index e323d4f3bcbaf8bffa7eba019b91aef85a666ccd..f9d2ea47d41b99039c7d450ffb30f0bea66e865d 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the specified nodes
diff --git a/testsuite/expect/test15.21 b/testsuite/expect/test15.21
index 085e3561d856617577c96c9d0708c18701db3bae..2e16fd60459a37c3c8c508987641ed395fbdf2f2 100755
--- a/testsuite/expect/test15.21
+++ b/testsuite/expect/test15.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of contiguous option with multiple nodes (--contiguous option).
diff --git a/testsuite/expect/test15.22 b/testsuite/expect/test15.22
index ccdab1ea1b2f4adfd6f2632d2ecd18d452744677..c7f892f2f4addcdf73534e2610315ed824a82c05 100755
--- a/testsuite/expect/test15.22
+++ b/testsuite/expect/test15.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of partition specification on job submission (--partition
diff --git a/testsuite/expect/test15.23 b/testsuite/expect/test15.23
index 28a8f6cedd32ce5895fd9253a33895dcdf91316e..a3cc4f85e135205de1251e1214e4693f8a956e97 100755
--- a/testsuite/expect/test15.23
+++ b/testsuite/expect/test15.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify environment variables controlling salloc are processed:
diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24
index 6d2082dfa3590a0df978f41d4641c5da933637f3..84a2c39d0c87d5c8dd4884757d584cb90dad460d 100755
--- a/testsuite/expect/test15.24
+++ b/testsuite/expect/test15.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --overcommit option.
diff --git a/testsuite/expect/test15.25 b/testsuite/expect/test15.25
index 098439237460b6cc9f7174bacc07a0877c27e72f..ced4d0ca2a95af6d803085f23853eb8d244b5612 100755
--- a/testsuite/expect/test15.25
+++ b/testsuite/expect/test15.25
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job account(--account option).
diff --git a/testsuite/expect/test15.26 b/testsuite/expect/test15.26
index 6bbaacbf0c41c2841234a216259b6e98e9a256ce..9a8f5c37d2015e4d00fedbb1130ba2327fc215eb 100755
--- a/testsuite/expect/test15.26
+++ b/testsuite/expect/test15.26
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test interuption of salloc while waiting for resource allocation.
diff --git a/testsuite/expect/test15.27 b/testsuite/expect/test15.27
index e7b975491fa4276781fd5df0deb934c756825749..7b749ab68ce0adf261268586e54a86d909a4baaa 100755
--- a/testsuite/expect/test15.27
+++ b/testsuite/expect/test15.27
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate salloc --exclusive with -n will give all cpus on node
diff --git a/testsuite/expect/test15.3 b/testsuite/expect/test15.3
index 33b823712d13d4115695c9e0504bcde7d7733779..a59b0f833fe2fec940b17fadb58b53bef3704618 100755
--- a/testsuite/expect/test15.3
+++ b/testsuite/expect/test15.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that salloc reports a proper version number (--version
diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4
index f86c93eb29290303a91b8cdbaced299f40150898..4ce7118b3c5b5846af12decab46427d9a14965f4 100755
--- a/testsuite/expect/test15.4
+++ b/testsuite/expect/test15.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes as the appropriate user and group.
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index 4fe41fdfb8c73f1bf91daffacd478e6204eca9aa..f126b02aece6e015a8312ed715fe7deee9bd0cc6 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that job time limit function works (--time and
diff --git a/testsuite/expect/test15.6 b/testsuite/expect/test15.6
index 11f4509c019584636e1d0b3bfd69d57744c20e0c..f23a3fc89242239f37f9d8434d8e3adfff5c5529 100755
--- a/testsuite/expect/test15.6
+++ b/testsuite/expect/test15.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of salloc verbose mode (-v option).
diff --git a/testsuite/expect/test15.7 b/testsuite/expect/test15.7
index 2194bf54a99714c195406252ed13cdcca2678811..30dc51dbb00ecfb2763c797788ee586a9f7c526b 100755
--- a/testsuite/expect/test15.7
+++ b/testsuite/expect/test15.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of processors, memory, and temporary disk space
diff --git a/testsuite/expect/test15.8 b/testsuite/expect/test15.8
index 06e9068dba805f1e87d0c7d272cb86ec958a01d8..108b98b17cb7ede8b429578957ae083513c59d1e 100755
--- a/testsuite/expect/test15.8
+++ b/testsuite/expect/test15.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of immediate allocation option (--immediate option).
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index 08e3ed1405c9f974499821cd08e068231aab4981..2df84c1496f192f22fd6962fece82d2e9f5dd59c 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that salloc exit code processing.
diff --git a/testsuite/expect/test16.1 b/testsuite/expect/test16.1
index d2cfdd598b048871b39154effb8adcb172350e07..ad8507f7474ca38a9cc20f10817706ce7b26ad14 100755
--- a/testsuite/expect/test16.1
+++ b/testsuite/expect/test16.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sattach usage option works (--usage option).
diff --git a/testsuite/expect/test16.2 b/testsuite/expect/test16.2
index aad6ee32662f000f95c918b907d8e981f27b4b6d..75df8128ce39802e205e7a315f09dd277ae34536 100755
--- a/testsuite/expect/test16.2
+++ b/testsuite/expect/test16.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sattach help option works (--help option).
diff --git a/testsuite/expect/test16.3 b/testsuite/expect/test16.3
index 17db793ed1616bf16d613234422aed9f6cabb03c..ec253b24ed2d54208382d5756c6f6421c12e35d0 100755
--- a/testsuite/expect/test16.3
+++ b/testsuite/expect/test16.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sattach reports a proper version number (--version
diff --git a/testsuite/expect/test16.4 b/testsuite/expect/test16.4
index 8f091b8f651b67079dad261d9d67286f141d7ef1..6f07af891ec7a3321134388e4c7c27c89a5f0753 100755
--- a/testsuite/expect/test16.4
+++ b/testsuite/expect/test16.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Basic sattach functionality test (--layout, --verbose, --label
diff --git a/testsuite/expect/test17.1 b/testsuite/expect/test17.1
index 0e57ae173009d748982021aada80f31451796447..b5cd02c351300c49f3907fc903c8ec9ab8c8a226 100755
--- a/testsuite/expect/test17.1
+++ b/testsuite/expect/test17.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch usage option works (--usage option).
diff --git a/testsuite/expect/test17.10 b/testsuite/expect/test17.10
index f4eeb2cd0f7598b2a348e4e2e2d9984403611ca9..4c094e1cf48415168de426dde6181fa112f456e0 100755
--- a/testsuite/expect/test17.10
+++ b/testsuite/expect/test17.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of processors, memory, and temporary disk space
diff --git a/testsuite/expect/test17.11 b/testsuite/expect/test17.11
index 6908c83053a8a298ae5a71e14d7e988bd7b1a6c9..4b28ad4480dc748a0e92b68a5f9e46119fa391e0 100755
--- a/testsuite/expect/test17.11
+++ b/testsuite/expect/test17.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of shared and contiguous options (--shared and --contiguous).
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index d59c76c4479cd946efbe3cb61e25fed10e6ba01c..923b3a162241a4c75274f6787cf5f4bc25806aa2 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify node configuration specification (--constraint option).
diff --git a/testsuite/expect/test17.13 b/testsuite/expect/test17.13
index d0066fde1ee481074010e54e6dfe113c8822082b..b4fce02e2fcf0aa8dfef3dbeccb6edea495fbada 100755
--- a/testsuite/expect/test17.13
+++ b/testsuite/expect/test17.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify the appropriate job environment variables are set
diff --git a/testsuite/expect/test17.14 b/testsuite/expect/test17.14
index 232319a38772951699b392aadce9455fa231e932..e68f05a427c52bb19fc3a43b7a5d72892a8b8a2a 100755
--- a/testsuite/expect/test17.14
+++ b/testsuite/expect/test17.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that user environment variables are propagated to the job
diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index b277ab2de296dc6f639b61d2e37951d3d8c8767c..b4a4d43c373e08b9d927d691ff3aaebf41234946 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that user user limits are propagated to the job
diff --git a/testsuite/expect/test17.16 b/testsuite/expect/test17.16
index 9034794865c306fef8ebece9cd783ed2776cba46..3aeeb88979a946c55254dbf7e1069828a78f61d5 100755
--- a/testsuite/expect/test17.16
+++ b/testsuite/expect/test17.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that arguments get forwarded to job script
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index e0049151f3a232dc50b6fc85435b36bca27a8f83..0aceed97e1c04ca04c725cf1ab2cd511d86c0f0e 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that node sharing flags are respected (--nodelist and
diff --git a/testsuite/expect/test17.18 b/testsuite/expect/test17.18
index 11207ead803331f304f9d2b2a611155e9df36e5d..fce2a6643f119880e1be803c0bc06a63e9417454 100755
--- a/testsuite/expect/test17.18
+++ b/testsuite/expect/test17.18
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job dependencies and deferred begin time (--depedency
diff --git a/testsuite/expect/test17.19 b/testsuite/expect/test17.19
index 622917f5879c7e8f754fa2c9d6646628ad8675e1..27143d5be8966cc9cce239bd8580322c54934b1c 100755
--- a/testsuite/expect/test17.19
+++ b/testsuite/expect/test17.19
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job submit to multiple partitions (--partition).
diff --git a/testsuite/expect/test17.2 b/testsuite/expect/test17.2
index 2d725b44d16433020e682648fb356d79e4b5e7cb..22e7602600fd1967f53008680908022893d00a87 100755
--- a/testsuite/expect/test17.2
+++ b/testsuite/expect/test17.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch help option works (--help option).
diff --git a/testsuite/expect/test17.20 b/testsuite/expect/test17.20
index 5a90a8dc498522e6b28b98c2d7527f71bda71610..5e1bfcadb9e98245335ff165f8ec79f199050478 100755
--- a/testsuite/expect/test17.20
+++ b/testsuite/expect/test17.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of mail options (--mail-type and --mail-user options).
diff --git a/testsuite/expect/test17.21 b/testsuite/expect/test17.21
index 0390f69d46ea036fc94869e8a6679889deeec4a9..3e8a864d1781453dbbc0c71e4b3959b110ee8a24 100755
--- a/testsuite/expect/test17.21
+++ b/testsuite/expect/test17.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Tests #SBATCH entry functionality in a batch script
diff --git a/testsuite/expect/test17.22 b/testsuite/expect/test17.22
index 4466224af05ed22f85260c7bdbf3f68f337e6104..c1a50f13839884fcc9e4684e6234c1aaf7b84cf8 100755
--- a/testsuite/expect/test17.22
+++ b/testsuite/expect/test17.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of running non-existant job, confirm timely termination.
diff --git a/testsuite/expect/test17.23 b/testsuite/expect/test17.23
index 26792300e5c7698c406a225090282a391a4a5aa2..b9b735e4344625de29c48c2c1d9aaff4728836e4 100755
--- a/testsuite/expect/test17.23
+++ b/testsuite/expect/test17.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of nice value specification (--nice option).
diff --git a/testsuite/expect/test17.24 b/testsuite/expect/test17.24
index b09e5b325661629d0ce750435225b521173b4156..1e44d3ed9f6f4fe0a17e5013b946250cc111d2af 100755
--- a/testsuite/expect/test17.24
+++ b/testsuite/expect/test17.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --partition and --verbose options.
diff --git a/testsuite/expect/test17.25 b/testsuite/expect/test17.25
index 07c25141575367da6e89aed605dc1a41b13ffe5a..9ed9cc04f3314129bbd27dd720a375508fb41e42 100755
--- a/testsuite/expect/test17.25
+++ b/testsuite/expect/test17.25
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify environment variables controlling sbatch are processed:
diff --git a/testsuite/expect/test17.26 b/testsuite/expect/test17.26
index 0ca15ecf3749a3118e0097f24dbb6097b74b617f..2f50922ab10b4f435292270e3ae1c3aaeedd5112 100755
--- a/testsuite/expect/test17.26
+++ b/testsuite/expect/test17.26
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --input option.
diff --git a/testsuite/expect/test17.27 b/testsuite/expect/test17.27
index 1aa8732ac1fabc4c33dc16c123dbac3622b415c1..6397bae73120130f43bd9acd5222051f1a7ffa78 100755
--- a/testsuite/expect/test17.27
+++ b/testsuite/expect/test17.27
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that a job executes with the specified nodes, requires multiple
diff --git a/testsuite/expect/test17.28 b/testsuite/expect/test17.28
index 609e00117119c73a6dd5b186dcead79b3ad83692..c3189ca77f49a6cf6d18458d6a617f24e664efd2 100755
--- a/testsuite/expect/test17.28
+++ b/testsuite/expect/test17.28
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Tests #SLURM entry functionality in a batch script.
diff --git a/testsuite/expect/test17.29 b/testsuite/expect/test17.29
index 2c8be01f37f111f3ba3dee294cb3643fbde9d7bc..8527c243bd34f42ef1c155f0b36883060723f3ca 100755
--- a/testsuite/expect/test17.29
+++ b/testsuite/expect/test17.29
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that arguments get forwarded to job script.
diff --git a/testsuite/expect/test17.3 b/testsuite/expect/test17.3
index e2f81557530e039303056a5ef5e5feee1b9aa810..8ec46d19f79457e47288e14530606ffb596bff90 100755
--- a/testsuite/expect/test17.3
+++ b/testsuite/expect/test17.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch reports a proper version number (--version
diff --git a/testsuite/expect/test17.31 b/testsuite/expect/test17.31
index b7401b7ddc3e55a8753a98158758c7719be29d0d..9e7a2bb666593e49116e9ac71bec4469372be40f 100755
--- a/testsuite/expect/test17.31
+++ b/testsuite/expect/test17.31
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Tests #PBS entry functionality in a batch script.
diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32
index 452a0100e1af67395d1d8fb2be7f2b4f0e4c697d..3d4beb18f2e4f76b48c20b79ca68eeb32d9c647f 100755
--- a/testsuite/expect/test17.32
+++ b/testsuite/expect/test17.32
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of --overcommit option.
diff --git a/testsuite/expect/test17.33 b/testsuite/expect/test17.33
index 330d11a7ad98f2720076438fe448d5aa70a6ca62..ac15c14a50295312e758e37872c2e6bdcbef4073 100755
--- a/testsuite/expect/test17.33
+++ b/testsuite/expect/test17.33
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of sbatch --open-mode (truncate or append) option.
diff --git a/testsuite/expect/test17.34 b/testsuite/expect/test17.34
index cb83ee94115740754b3ac8b82562108ef64170bf..658b2a272bf233cc59c66814eb8de373943edab7 100755
--- a/testsuite/expect/test17.34
+++ b/testsuite/expect/test17.34
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that the core spec option in sbatch allocates the correct
diff --git a/testsuite/expect/test17.35 b/testsuite/expect/test17.35
index 7ed0fb1aedbd135d78f56f8dddb65540dfb147fa..0317d8d770afc1eb5badab785bff5b0c73fcdcfa 100755
--- a/testsuite/expect/test17.35
+++ b/testsuite/expect/test17.35
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test performance/timing of job submissions.
diff --git a/testsuite/expect/test17.36 b/testsuite/expect/test17.36
index 0dff4d4253ae068744f6a64bf86417680e98c829..6ed8641494bac106cf1d3c771a18b26efa101cb5 100755
--- a/testsuite/expect/test17.36
+++ b/testsuite/expect/test17.36
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that the shared option in partitions is being enforced.
diff --git a/testsuite/expect/test17.37 b/testsuite/expect/test17.37
index 1747ec403289d365e63f5b43c06c65370622fff3..6de52bbdcc768afd784c99421510b93082ddf153 100755
--- a/testsuite/expect/test17.37
+++ b/testsuite/expect/test17.37
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that the afternotok dependency is enforced
diff --git a/testsuite/expect/test17.38 b/testsuite/expect/test17.38
index fc0b8d33b05972abf1209ea6d42c81157b5ccc63..d9e7a0b52c4fc592e9363da88a97e64a95dd9fb9 100755
--- a/testsuite/expect/test17.38
+++ b/testsuite/expect/test17.38
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for sbatch --signal
diff --git a/testsuite/expect/test17.4 b/testsuite/expect/test17.4
index 6da5af52efba4fdb6589da67e55fc4fef648b53d..274b28315685ebeb05558ecd0cf5291705bf2c94 100755
--- a/testsuite/expect/test17.4
+++ b/testsuite/expect/test17.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that as sbatch job executes as the appropriate user and
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 557d7032e3df8ef78e70b7fa89e44252d1ffbac4..8713ac42080ea602a1b8861fdf727386204f274a 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch stdout, and stderr options work (--output
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index bfecf6b1f59dd0badde2ade1e4535f8e62d7c2ba..8767de148a503c4216d310b466bddb8155b87506 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that a job executes with the proper task count (--ntasks
diff --git a/testsuite/expect/test17.7 b/testsuite/expect/test17.7
index e3c62592dd39ea8b78ae3f786f4f6d2167129b74..5230c5bd2d8db1874ec843243718b67668e0a206 100755
--- a/testsuite/expect/test17.7
+++ b/testsuite/expect/test17.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch sets appropriate working directory (--workdir
diff --git a/testsuite/expect/test17.8 b/testsuite/expect/test17.8
index 4a1dd1c8ff78a4cf71909278bdf7e9c1d4c2fd04..daa16f61f35e4a5c93cefc67364292788b6a0355 100755
--- a/testsuite/expect/test17.8
+++ b/testsuite/expect/test17.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch sets appropriate time limit (--time
diff --git a/testsuite/expect/test17.9 b/testsuite/expect/test17.9
index 630e0769ef3b3efd53b6eb194ed082d0e275c5ba..a27acfd37bbb314fd271963ea5a262b064c02de1 100755
--- a/testsuite/expect/test17.9
+++ b/testsuite/expect/test17.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sbatch sets appropriate job name (--job-name option
diff --git a/testsuite/expect/test19.1 b/testsuite/expect/test19.1
index ece58f4c1d9b2563bb212476157c29a5ef03ee10..969b8b3a9abbf7a4ccaf67701ca48c9990385e6a 100755
--- a/testsuite/expect/test19.1
+++ b/testsuite/expect/test19.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --help
diff --git a/testsuite/expect/test19.2 b/testsuite/expect/test19.2
index c2dc1af6a9051c793fe7c2a55bc2af247b51104b..c59d58bfb0473ce47e18f2c38bf500124bc1e696 100755
--- a/testsuite/expect/test19.2
+++ b/testsuite/expect/test19.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --usage
diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index 286201ebbebccb2a15fa52bc85b24e5d20a864b6..0f00f837c9e8fe62fa96c1e4fac46a770dcea84c 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --set (node options)
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index 7c6892dff3da9f197f62c51edfda2afb50c1b5da..8499a2244bf3142f6553800401422b7fb1830eda 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --set --reconfig
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index b14e5c88ecb7b8f82a6a87322aa51dcd58405581..0638efcc80f01efe5c8f9c2b4219bc2a9f5ea7e1 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --set (job options)
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index 3f4f1dad49291a5854136a0bf468bc0a3efa2e3c..671588887faf4109995fdfb97c0ebeb3648996af 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --clear and --get (with filtering)
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index 8a936cc9575644b2308fde896950e5644b301c32..cb06d708d4242572af0e7c82b1cb04912f43e8f3 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# strigger --set --idle
diff --git a/testsuite/expect/test19.8 b/testsuite/expect/test19.8
index 546291277f1938210d64df898383bf554bde139c..c67139b067f9b718107d7467a124f0341dd47ab5 100755
--- a/testsuite/expect/test19.8
+++ b/testsuite/expect/test19.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that strigger --noheader does not print header
diff --git a/testsuite/expect/test19.9 b/testsuite/expect/test19.9
index bf66fc8fd5726028cd475cb8da114a53d1e4f86d..9cf982d042af7714e7b700b5f815637fa25347de 100755
--- a/testsuite/expect/test19.9
+++ b/testsuite/expect/test19.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that strigger will not submit duplicate triggers
diff --git a/testsuite/expect/test2.1 b/testsuite/expect/test2.1
index bc2267d21f56a23dda167300a4ca915c6be538a3..78314601d2479e92ab73dcfdcaf0f20fc3ffec85 100755
--- a/testsuite/expect/test2.1
+++ b/testsuite/expect/test2.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol version command.
diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
index d0d4e03f9eca60f395ea27f7fd7ac4cf86f67f29..8332be20ae04c67da9fac7825d4b08eb1f3868b0 100755
--- a/testsuite/expect/test2.10
+++ b/testsuite/expect/test2.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol oneliner mode (--oneliner option).
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index a6f396c5934150c00080e9b78ac2cb5efc998d59..e802fd0490274370b206dd4ccfc57dffdcbf6377 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol listpids command.
diff --git a/testsuite/expect/test2.12 b/testsuite/expect/test2.12
index 990afc7f52fc80e0c28e1bc5a5f5cf3f94de2900..71008771eb213eafa118b113c2ec7fbc3924ffff 100755
--- a/testsuite/expect/test2.12
+++ b/testsuite/expect/test2.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol show topology option.
diff --git a/testsuite/expect/test2.13 b/testsuite/expect/test2.13
index 620d28dcedca0e6dd43c78f9bdc6332de50a4b28..c274e768f4630869c55378721aef04f1ece9a92c 100755
--- a/testsuite/expect/test2.13
+++ b/testsuite/expect/test2.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for job steps.
diff --git a/testsuite/expect/test2.14 b/testsuite/expect/test2.14
index 09bfd16bcd1b5190920435f2e77077b4c7ac149e..c243a6b063af6ebfb192781168b50757f6ce2f8d 100755
--- a/testsuite/expect/test2.14
+++ b/testsuite/expect/test2.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update size of running job.
diff --git a/testsuite/expect/test2.15 b/testsuite/expect/test2.15
index 3106d81bc3bdb1434cb8540e7e2384baebb76551..87ad3d6fd8d0fbf67bf0545916c10a15f9ecf98e 100755
--- a/testsuite/expect/test2.15
+++ b/testsuite/expect/test2.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update size of running job with some running tasks.
diff --git a/testsuite/expect/test2.16 b/testsuite/expect/test2.16
index aabcb1f76b8b292721e4c42b88151b5b91260656..6d66af668c00d1876db9141da29d6fe71e5ee5f0 100755
--- a/testsuite/expect/test2.16
+++ b/testsuite/expect/test2.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol displays and updates Allow/Deny accounts.
diff --git a/testsuite/expect/test2.17 b/testsuite/expect/test2.17
index 1ffd4f1e40c12c77a8cd038cff1d519295f44c4b..628ea8c6db41e6553b6906192395da44fc534b4c 100755
--- a/testsuite/expect/test2.17
+++ b/testsuite/expect/test2.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol displays and updates Allow/Deny Qos.
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index 8fde7feb3e4739fe2880e4d1989cac69d1316714..7d15dacacd738e3d903ae936aba1be97f220af47 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that Allow/Deny accounts are enforced.
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index e4882ccd671a0ae22bf93f0fdbe01c47f4cfb372..0869d0d7a220f9fde26c6430d4bcd5b8976336a7 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that Allow/Deny Qos are enforced.
diff --git a/testsuite/expect/test2.2 b/testsuite/expect/test2.2
index e95543b237bbe4b21aae9f7c453663f9b262d947..26627763af4e53e5a59f48cc867225b2cf2d1d0e 100755
--- a/testsuite/expect/test2.2
+++ b/testsuite/expect/test2.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol help command.
diff --git a/testsuite/expect/test2.20 b/testsuite/expect/test2.20
index d466deafc2eee13a774580de0c98c6b41590462e..36fbfe1b9ee44656cf628dd1b5151f0b9f9ddb32 100755
--- a/testsuite/expect/test2.20
+++ b/testsuite/expect/test2.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol show hostnames.
diff --git a/testsuite/expect/test2.21 b/testsuite/expect/test2.21
index d97c6505ead451a9ef45bb6fd4cd7a86a576ecd8..a41b859f3c714e19ac85233764d128160f2e4eea 100755
--- a/testsuite/expect/test2.21
+++ b/testsuite/expect/test2.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol requeue of failed or completed job.
diff --git a/testsuite/expect/test2.22 b/testsuite/expect/test2.22
index 46e19d147196355a491faf8377e55e7b77ba5904..2e3dee454876fd21ee05f2278f167ae2bce73a12 100755
--- a/testsuite/expect/test2.22
+++ b/testsuite/expect/test2.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol requeuehold requeues job to held pending state.
diff --git a/testsuite/expect/test2.23 b/testsuite/expect/test2.23
index 877d766c100df21628970f277e8cb5c749707041..cd3d6d198be9cff5c6cf8368141a40dbd5b26449 100755
--- a/testsuite/expect/test2.23
+++ b/testsuite/expect/test2.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol requeuehold State=SpecialExit.
diff --git a/testsuite/expect/test2.24 b/testsuite/expect/test2.24
index 5acaf7a78cc3b31565acc33e18ade01a03d574ce..4bfe4f8c1c0531b51f0c1ab9bef8c6381076f2d3 100755
--- a/testsuite/expect/test2.24
+++ b/testsuite/expect/test2.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Checks that scontrol write config creates a slurm.conf
diff --git a/testsuite/expect/test2.3 b/testsuite/expect/test2.3
index 0745bfb35ac024976655e6bfe7a5992c23f5a941..d37bc7942f382112b870ada4a300241090d3392e 100755
--- a/testsuite/expect/test2.3
+++ b/testsuite/expect/test2.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol ping command.
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index f9b7dfde17830b61b7b42463c5b5d4d9f6e0cea3..de8e5728112250c49b4551738569a9d58711cfda 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol exit, quit, and !! commands.
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index e31a7d1d23edde680f76706a8f9b93cf056e5845..2f13532a58a494fa5b686d8f41387bbfd804a85d 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol show commands for configuation, daemons,
diff --git a/testsuite/expect/test2.6 b/testsuite/expect/test2.6
index 95e4da92feab4d188daacc0272e256b7cf5d6ded..39859603c0e1135596cbfad0d7a70342be600545 100755
--- a/testsuite/expect/test2.6
+++ b/testsuite/expect/test2.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol verbose and quiet options.
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index 26ad1d9acef91e39f476438c614aeab5649fe61d..e9da3f0d2142b719485e0d724c8ec37937231d55 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol pidinfo command.
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index 3de02c4c31743ee6b98d825e77ff4fe43f36def4..fbb048336c4ef418ec9760ea4a059aa57a7b61fe 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol show commands for jobs and steps.
diff --git a/testsuite/expect/test2.9 b/testsuite/expect/test2.9
index 6228cb877415c75f62b258d6c787eacc7c53c29a..54cc4daaa3078e093b0ae7d6777a8c17de7e127e 100755
--- a/testsuite/expect/test2.9
+++ b/testsuite/expect/test2.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol completing command.
diff --git a/testsuite/expect/test20.1 b/testsuite/expect/test20.1
index ade77b36144b557994fe993797088834bedbf10d..7b8bc7e9e9f354172ba2de48839a7a99f4bd0f0a 100755
--- a/testsuite/expect/test20.1
+++ b/testsuite/expect/test20.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# qsub command tests
diff --git a/testsuite/expect/test20.10 b/testsuite/expect/test20.10
index ce0ca00d8606e5bddc56cd550aa206adb8eaed6c..084c55bf5c8805a6c35b45eb445765288b87c796 100755
--- a/testsuite/expect/test20.10
+++ b/testsuite/expect/test20.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for the qrerun --help option
diff --git a/testsuite/expect/test20.11 b/testsuite/expect/test20.11
index 98da9a5b5eaf2c26e9c02a408e02bc6d45d276b3..5198623459665f59348048eec793f4cecf21c163 100755
--- a/testsuite/expect/test20.11
+++ b/testsuite/expect/test20.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for the qrerun --man option
diff --git a/testsuite/expect/test20.12 b/testsuite/expect/test20.12
index 8834939697f76505bffee0a78e550797667ace9e..c1b56da2ae4748149082b1f8c86f4b7d75c49b24 100755
--- a/testsuite/expect/test20.12
+++ b/testsuite/expect/test20.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for the qsub -V and -v options
diff --git a/testsuite/expect/test20.2 b/testsuite/expect/test20.2
index 83eb616a698803131629e136906025517339342b..4e6cf7c6d5784336db1520d392fab5340e573fd5 100755
--- a/testsuite/expect/test20.2
+++ b/testsuite/expect/test20.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# qstat command tests
diff --git a/testsuite/expect/test20.3 b/testsuite/expect/test20.3
index 0f5d00d34aa3f9e5c81bbb59ecf11bc794f766d7..3a92003ae824cb26a71bc25e84b4597b25c8241a 100755
--- a/testsuite/expect/test20.3
+++ b/testsuite/expect/test20.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# qdel command tests
diff --git a/testsuite/expect/test20.4 b/testsuite/expect/test20.4
index 100eea0a52813b8b6270ca27fc37a10786f43e71..4b3a7933f0080dc073bb31a581c4fbaa1b5e3b68 100755
--- a/testsuite/expect/test20.4
+++ b/testsuite/expect/test20.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# pbsnodes command tests
diff --git a/testsuite/expect/test20.5 b/testsuite/expect/test20.5
index c1223502a8454cc638e85cc5292caf6707f8aff2..32b9887da928b210ade7d13280dcde41586b85bc 100755
--- a/testsuite/expect/test20.5
+++ b/testsuite/expect/test20.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test the qalter --help option
diff --git a/testsuite/expect/test20.6 b/testsuite/expect/test20.6
index 9181c547b22a889f10e7c15efe7ae8e9ab5ca0ed..22fa479ed9b3ef8475a29921ac3c70d9571a5830 100755
--- a/testsuite/expect/test20.6
+++ b/testsuite/expect/test20.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test the qalter -r option of altering a job's rerunnable flag
diff --git a/testsuite/expect/test20.7 b/testsuite/expect/test20.7
index 7aa738f7444518c8e8ced819bae7274334bba26f..8abf954bd4d9ea86b2b1c757150e154790225f85 100755
--- a/testsuite/expect/test20.7
+++ b/testsuite/expect/test20.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test qalter's -o option for changing the stdout path of a job.
diff --git a/testsuite/expect/test20.8 b/testsuite/expect/test20.8
index 27998eab6b1c9dd9ca1dc6233161b6d5a7a31d35..246deda6914369e0cba21fcb502d4919412ab8a1 100755
--- a/testsuite/expect/test20.8
+++ b/testsuite/expect/test20.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test the qalter -N option for changing the name of a job.
diff --git a/testsuite/expect/test20.9 b/testsuite/expect/test20.9
index 1b8f96031a570033c4ef5f1ac3f40ab74074476d..08949dd8c253de550179c502f89c4e0f2bde3cf7 100755
--- a/testsuite/expect/test20.9
+++ b/testsuite/expect/test20.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test for the qalter --man option
diff --git a/testsuite/expect/test21.1 b/testsuite/expect/test21.1
index da94779b880b862753307c93f0dc56c0124101f4..b63a4b57becc186466dea1984ecffe69bc10a1e7 100755
--- a/testsuite/expect/test21.1
+++ b/testsuite/expect/test21.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacctmgr --usage option. (initially same as --help)
diff --git a/testsuite/expect/test21.10 b/testsuite/expect/test21.10
index 340383fd9fb482b45b52005a3588222a9a86a063..9c5a6daca4f77227e0cd04736877863d6a7a9a48 100755
--- a/testsuite/expect/test21.10
+++ b/testsuite/expect/test21.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add an account
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 8795b2c1735c8f04be8272037ab931a857dffde2..7460c4c03d3cd76bb0755d2b7e36f625d7d5770f 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add multiple accounts
diff --git a/testsuite/expect/test21.12 b/testsuite/expect/test21.12
index e6643bec9c1b5ca48298546883b63a71bdf7d903..e1810cdd23ef0c5ceaf113a0a12d9c46708b1dfd 100755
--- a/testsuite/expect/test21.12
+++ b/testsuite/expect/test21.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr list accounts
diff --git a/testsuite/expect/test21.13 b/testsuite/expect/test21.13
index 84919056c51b3a001ae1433ff3f3beb778fc6405..a78e54bd156bd8ae200f0e497c8cc278c1132e86 100755
--- a/testsuite/expect/test21.13
+++ b/testsuite/expect/test21.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify account, descriptions, limits
diff --git a/testsuite/expect/test21.14 b/testsuite/expect/test21.14
index 6ca20b260f1a3009c5733d6be761d4535ac923db..42a24fa4098869fc5de69ddca689d70e3b5a5742 100755
--- a/testsuite/expect/test21.14
+++ b/testsuite/expect/test21.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify accounts, descriptions, limits,
diff --git a/testsuite/expect/test21.15 b/testsuite/expect/test21.15
index 1caaa68ff19eb1a18ad9f50883c5e77eac10dabe..4082594fbc126861e6d90e8e46a6bd6e895c02f2 100755
--- a/testsuite/expect/test21.15
+++ b/testsuite/expect/test21.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add user
diff --git a/testsuite/expect/test21.16 b/testsuite/expect/test21.16
index 9ef63ad79be4fa7f2e611dfb797d466dc264fd75..af1a2cac5031b58bedf18fcae9e12623857e7e34 100755
--- a/testsuite/expect/test21.16
+++ b/testsuite/expect/test21.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add multiple users
diff --git a/testsuite/expect/test21.17 b/testsuite/expect/test21.17
index e8433a0e37c7cb22038c455c43d5647c67063c06..dce23faf3e63c124187f21c047e2893a680cc088 100755
--- a/testsuite/expect/test21.17
+++ b/testsuite/expect/test21.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify a user
diff --git a/testsuite/expect/test21.18 b/testsuite/expect/test21.18
index 2b1f2a9c986135d1536014ac7ab9849426d1bc00..5d4d347b9d6b7872b9487a62ec8cfe93c192adb5 100755
--- a/testsuite/expect/test21.18
+++ b/testsuite/expect/test21.18
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify multiple users
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index b9babdac63ba1ba2d39e44da3cef53987f677e48..3cc892aa9d5f30f5fd99dd45eb6ec1d5e3c53c02 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add a coordinator
diff --git a/testsuite/expect/test21.2 b/testsuite/expect/test21.2
index adb1fcdb9426831fa646545019fdb4c01b77b36c..43fead938e247988c42e300df7c5deb252287d15 100755
--- a/testsuite/expect/test21.2
+++ b/testsuite/expect/test21.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacctmgr --help option.
diff --git a/testsuite/expect/test21.20 b/testsuite/expect/test21.20
index afa45a6a885b02ca5106be4f17c3efa25f11c913..ea35c761e0648c1369a34f3daf37bc5ffb20e78f 100755
--- a/testsuite/expect/test21.20
+++ b/testsuite/expect/test21.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr QoS modify test
diff --git a/testsuite/expect/test21.21 b/testsuite/expect/test21.21
index 3001603a1534d58a62acea79ce9c0d0a06cd77c5..f24bdffab062597e49f8ae798ff76812ba6eecd7 100755
--- a/testsuite/expect/test21.21
+++ b/testsuite/expect/test21.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add an account to this cluster and try using it with
diff --git a/testsuite/expect/test21.22 b/testsuite/expect/test21.22
index 36776552b7280cda988eb28921b0fd69d8adb0d0..6f0093dc02939d7ab22cc47f2a0577578d8eb585 100755
--- a/testsuite/expect/test21.22
+++ b/testsuite/expect/test21.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr load data file
diff --git a/testsuite/expect/test21.23 b/testsuite/expect/test21.23
index 7b2a1cfc971ccc9cdb34487a2e80f85e045bcc38..9cd175d56bf28b03865f26f27b52e0966b5d5211 100755
--- a/testsuite/expect/test21.23
+++ b/testsuite/expect/test21.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr verify wckey
diff --git a/testsuite/expect/test21.24 b/testsuite/expect/test21.24
index d4255aec6fcd43102f6800032444033042127359..d6a4bd260e3a42b26182935ad2d65c073ed5fb78 100755
--- a/testsuite/expect/test21.24
+++ b/testsuite/expect/test21.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr dump test
diff --git a/testsuite/expect/test21.25 b/testsuite/expect/test21.25
index 95afa19608a90ab946292825448f933d71b62cc2..c7c7f5fd92b0d826b21bc7eb762d09bff1b4db45 100755
--- a/testsuite/expect/test21.25
+++ b/testsuite/expect/test21.25
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr show config
diff --git a/testsuite/expect/test21.26 b/testsuite/expect/test21.26
index 97c98a4317c9de6533384ae861fec977f0038fc7..757992e63102afe178425025888a7592458e7bb0 100755
--- a/testsuite/expect/test21.26
+++ b/testsuite/expect/test21.26
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr +=, -= modify QoS test
diff --git a/testsuite/expect/test21.27 b/testsuite/expect/test21.27
index 82b7f1e7c75c302ab4f36f8d1520dc4e8b30d5ec..874f9150c234b46ae28d8710df9f537db101cebd 100755
--- a/testsuite/expect/test21.27
+++ b/testsuite/expect/test21.27
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr show problems
diff --git a/testsuite/expect/test21.28 b/testsuite/expect/test21.28
index dbc1321621f8df9a4239730ed5733f0485d5d94a..6ce5a8caf12d31e57d4bcb1739e4d6d1f4aab375 100755
--- a/testsuite/expect/test21.28
+++ b/testsuite/expect/test21.28
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr delete N (abort) test
diff --git a/testsuite/expect/test21.29 b/testsuite/expect/test21.29
index 05a7a70dc20f33e8329f5c97479db63c156f950b..d58469e6af9e9da94e31b3621b144f267e140bba 100755
--- a/testsuite/expect/test21.29
+++ b/testsuite/expect/test21.29
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr clear (modify) QoS values
diff --git a/testsuite/expect/test21.3 b/testsuite/expect/test21.3
index 111c8e075c503822572333cd755eb698f2dfbdc9..531f7297d0b497ed3efefbfb996d115bf7315207 100755
--- a/testsuite/expect/test21.3
+++ b/testsuite/expect/test21.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacctmgr -V (display version)
diff --git a/testsuite/expect/test21.30 b/testsuite/expect/test21.30
index 022560fb6c1588203f2e2cafc782c34e5d34602a..921e47b4aa8711089ab6c0905c872fd59656ab93 100755
--- a/testsuite/expect/test21.30
+++ b/testsuite/expect/test21.30
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that checks if the QOS limits are enforced.
diff --git a/testsuite/expect/test21.31 b/testsuite/expect/test21.31
index 9062624a38d67d14d70e5bcdb01916ff0891699d..4f63e44825a2aa0b4d4c1e5b2b44b9bdbfeda2af 100755
--- a/testsuite/expect/test21.31
+++ b/testsuite/expect/test21.31
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr clear (modify) resource values
diff --git a/testsuite/expect/test21.32 b/testsuite/expect/test21.32
index 0694f48cd16f703f3e96edc9f0c9b9d8e04492dc..65fe4ac99e0fbd56dcc369dbd408763a5aed194f 100755
--- a/testsuite/expect/test21.32
+++ b/testsuite/expect/test21.32
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that mod QoS modifies the preempt QoS when using =,+=,
diff --git a/testsuite/expect/test21.4 b/testsuite/expect/test21.4
index 91aa4c68e9c5c7aee5080d85f023124c437faacf..f965d94bed8f9f68e186c776f5fd4f3822dd13af 100755
--- a/testsuite/expect/test21.4
+++ b/testsuite/expect/test21.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sacctmgr version (display version)
diff --git a/testsuite/expect/test21.5 b/testsuite/expect/test21.5
index a2c240ca7a8f624c8b414457a3b443809ed804d3..dc6b3af272f2763984bddbc05e71717e33f8f589 100755
--- a/testsuite/expect/test21.5
+++ b/testsuite/expect/test21.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add a cluster
diff --git a/testsuite/expect/test21.6 b/testsuite/expect/test21.6
index 1cd7c3b889c03bd8920e6a1a0ebc62343d9ec9df..ee91d0d3f467bbf582f04826186fd01836e5a7fa 100755
--- a/testsuite/expect/test21.6
+++ b/testsuite/expect/test21.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr add multiple clusters
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index 40510a3d8ed0a0561e95d3d8e70e8f17da0b587e..cd243398583e6eaf1741e4fb171ad321dbc56dea 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr list clusters
diff --git a/testsuite/expect/test21.8 b/testsuite/expect/test21.8
index 0368e9acaaa9eaa395f20a7d42f2917e853a3bbd..f1b15b0435c141a2cd9978ac0cf24f14e8666f50 100755
--- a/testsuite/expect/test21.8
+++ b/testsuite/expect/test21.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify cluster
diff --git a/testsuite/expect/test21.9 b/testsuite/expect/test21.9
index 70c783cbcfe0dfb983acc66c0237c51adf101452..98d56968c12562b7cc9208a10fea6dded98e5871 100755
--- a/testsuite/expect/test21.9
+++ b/testsuite/expect/test21.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sacctmgr modify multiple clusters
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index 96b8fb0487748fd6376d7ef80b10cd111c484e59..3af74d1ba1a6e0c6aab495147bce895a42ec0b23 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sreport cluster utilization.
diff --git a/testsuite/expect/test22.2 b/testsuite/expect/test22.2
index 242ad261039b818e144ea0df3a288ff4751f86dc..6bea9c33f4872b14eb7dbdb07afdbc1e2863fe3a 100755
--- a/testsuite/expect/test22.2
+++ b/testsuite/expect/test22.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM sreport functionality
# sreport h, n, p, P, t, V options.
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 47f64c9d08e8c78acf4e7b261a5f78f4eab91d7d..943950e0c478b515dda803447cf9b6dfa1d1bf03 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sstat h, e, usage and V options.
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index 7ad66b0aa08f812cdab43c9364e4cbb73ffd4328..11813f8a1fe991aa00e447f9df024612b3948b6b 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM sstat functionality
# sstat a, n, o, p, P and v options.
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index b1836266f672deefbb02ac02e3d6e1eb3a14b7cf..4dba0b861c675a8aeacc0eb83834f156b47bc371 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of priority multifactor algo to get correct decay and
# such.
diff --git a/testsuite/expect/test24.2 b/testsuite/expect/test24.2
index 850f09695bee1e50111e48bb65612cf05562f855..885e38299bf6a9af643988e0fa6177d5b40cabde 100755
--- a/testsuite/expect/test24.2
+++ b/testsuite/expect/test24.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM sshare functionality
# sshare h, p, P, v and V options.
diff --git a/testsuite/expect/test24.3 b/testsuite/expect/test24.3
index 30d74e10f424434ea63d21429ed45658381352e1..c0f9afec0d05a04027dd6c8304938fa8b475e8a2 100755
--- a/testsuite/expect/test24.3
+++ b/testsuite/expect/test24.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of priority multifactor combined with Fairshare=parent. A
# failure of this test but a success of test24.3 is indicative
diff --git a/testsuite/expect/test24.4 b/testsuite/expect/test24.4
index 7fb9c7ea466ee5b5540602efcb06f522dbb7a86c..45d759299b34fc8afe44e3a408775357cc5ba8f3 100755
--- a/testsuite/expect/test24.4
+++ b/testsuite/expect/test24.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of Fair Tree multifactor
#
diff --git a/testsuite/expect/test25.1 b/testsuite/expect/test25.1
index 34870511bc8e76bdf0b32c202dd4869099352a30..ccdf433b4486a73d43c2a7477240a90daf413e0f 100755
--- a/testsuite/expect/test25.1
+++ b/testsuite/expect/test25.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM sprio functionality.
#
diff --git a/testsuite/expect/test26.1 b/testsuite/expect/test26.1
index f8175903ef412694bf3f2431cee2ba3406a166a6..176526c4dd0ec735bc13148ae121ee1d538a75a5 100755
--- a/testsuite/expect/test26.1
+++ b/testsuite/expect/test26.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for nodes is disabled.
diff --git a/testsuite/expect/test26.2 b/testsuite/expect/test26.2
index 6fdfcfa3e6f7400e4f84b11ea8149ca4aeee0cf3..dd6e0c3a257dd423284413b2822b1f90c5d42e98 100755
--- a/testsuite/expect/test26.2
+++ b/testsuite/expect/test26.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of srun/aprun wrapper use of --alps= option
diff --git a/testsuite/expect/test27.1 b/testsuite/expect/test27.1
index c56f9d096c50f35c908134456be7d6e8cc50f26d..59a57a323f1733836d935f4f1738b6e25a61750b 100755
--- a/testsuite/expect/test27.1
+++ b/testsuite/expect/test27.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sdiag --usage option. (initially same as --help)
diff --git a/testsuite/expect/test27.2 b/testsuite/expect/test27.2
index 155af9fdb50bb205a53369512855c9f096514b42..3118b3c491d2fa53cd8e192e9fb8921efa9097c1 100755
--- a/testsuite/expect/test27.2
+++ b/testsuite/expect/test27.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# sdiag --help
diff --git a/testsuite/expect/test27.3 b/testsuite/expect/test27.3
index ccdd9dbd34cf79b336d69b2b07fb04665f26a675..ac5ce271805c81d8a759f864d34b0d4fa40f2302 100755
--- a/testsuite/expect/test27.3
+++ b/testsuite/expect/test27.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sdiag -V (display version)
diff --git a/testsuite/expect/test27.4 b/testsuite/expect/test27.4
index e37ab938d65dbc9a887b6efb8aa4dd1e12de1a33..c6e86171174625c3bc2f5e47d91ec54afb71057b 100755
--- a/testsuite/expect/test27.4
+++ b/testsuite/expect/test27.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sdiag --all (default output)
diff --git a/testsuite/expect/test27.5 b/testsuite/expect/test27.5
index e37e46084dae170c92eba622f5010cb1688031ff..59c0d9e8408e38e41dd39e9c56526f208f26fb81 100755
--- a/testsuite/expect/test27.5
+++ b/testsuite/expect/test27.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test sdiag --reset
diff --git a/testsuite/expect/test28.1 b/testsuite/expect/test28.1
index fe9ae15edbf7875b05db31b570ee6f33bc6f024d..a552cf72a39fb85c358bb09e288c418d2f640f81 100755
--- a/testsuite/expect/test28.1
+++ b/testsuite/expect/test28.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirms that the sbatch --array option is submitted and
diff --git a/testsuite/expect/test28.2 b/testsuite/expect/test28.2
index 1bc44dbc67407848222b88cef5097698f7a93456..062f9f5f98e251937d136ffac8b51ea2fb572ec6 100755
--- a/testsuite/expect/test28.2
+++ b/testsuite/expect/test28.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# checks that the --array environment varibles are correct, and
diff --git a/testsuite/expect/test28.3 b/testsuite/expect/test28.3
index 539998623c9b87d00d982567adff3a8f4b1ce810..27befc0cffa1c8c69c5a86503ec726f1c63f846d 100755
--- a/testsuite/expect/test28.3
+++ b/testsuite/expect/test28.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that the scontrol show job option has the job
diff --git a/testsuite/expect/test28.4 b/testsuite/expect/test28.4
index 5b62dc7e84e7affe3ff4afd82b5aeebb0659f6c8..4a4f7b748715391c3cba49378d1156b942193a97 100755
--- a/testsuite/expect/test28.4
+++ b/testsuite/expect/test28.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that scontrol update will update job using
diff --git a/testsuite/expect/test28.5 b/testsuite/expect/test28.5
index 500907ac59250c659d9e92c9ae6e2bf6db1806b8..38055fadb66e5faa3d47f99beedda14d8e260bc1 100755
--- a/testsuite/expect/test28.5
+++ b/testsuite/expect/test28.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# test that a scontrol can hold and release a whole job array
diff --git a/testsuite/expect/test28.6 b/testsuite/expect/test28.6
index 6766157bf94c97a5fd001951005223239a24f4f2..078fdef0afeb6a60ea02420fc4c163925c815fc9 100755
--- a/testsuite/expect/test28.6
+++ b/testsuite/expect/test28.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# test that when a job array is submitted to multiple
diff --git a/testsuite/expect/test28.7 b/testsuite/expect/test28.7
index 91e13c9b30a3c4314a571bfe12b9c6e8bdd8b785..95782e92e71ceddd5fe5d5950859b69eb5c76c84 100755
--- a/testsuite/expect/test28.7
+++ b/testsuite/expect/test28.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirms job array dependencies.
diff --git a/testsuite/expect/test29.1 b/testsuite/expect/test29.1
index 5f92467b75d9db333ef54e7382c21a6b5777c14c..5318e889ce7cd6e9bf7e8d23d71351c29a42fb5c 100755
--- a/testsuite/expect/test29.1
+++ b/testsuite/expect/test29.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validate smd usage command.
diff --git a/testsuite/expect/test29.2 b/testsuite/expect/test29.2
index b40c5ee1b50bc4982020337186ef967b96d9b82b..34a16782b5def69fc5a61092ab32ee1d0473651d 100755
--- a/testsuite/expect/test29.2
+++ b/testsuite/expect/test29.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validate smd show config command
diff --git a/testsuite/expect/test29.3 b/testsuite/expect/test29.3
index 078cd5f65d6d19febaf298b5f82b73f70981056d..ed15c7f43a02cee957f24703ad7e998d0beff15e 100755
--- a/testsuite/expect/test29.3
+++ b/testsuite/expect/test29.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validate smd -f (--faulty-nodes) commands.
diff --git a/testsuite/expect/test29.4 b/testsuite/expect/test29.4
index 9b6828d9d250dee9d040cbc3e450cf7d5411574b..ae32010fc6b94ebca783f21204f5e27eb0163d7f 100755
--- a/testsuite/expect/test29.4
+++ b/testsuite/expect/test29.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate smd -d (--drain-node), and -R (--reason) set.
diff --git a/testsuite/expect/test29.5 b/testsuite/expect/test29.5
index 5472182a2897934c01c22b53ec73dc7793d40696..5383bec91973ca092df85153bfa2b5bc76629d13 100755
--- a/testsuite/expect/test29.5
+++ b/testsuite/expect/test29.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# validate smd -r (--replace-node) option.
diff --git a/testsuite/expect/test29.6 b/testsuite/expect/test29.6
index 21c18239fb7d5682142938ca594523db2967c5a7..d5e3fa53b6c1f1041b63b243ed7b9bfa61e7d68d 100755
--- a/testsuite/expect/test29.6
+++ b/testsuite/expect/test29.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# confirms that the smd -e options extends the
diff --git a/testsuite/expect/test29.7 b/testsuite/expect/test29.7
index 1a7aa4c7eff7a62661de6a1fdd2d2312257d062d..bd26cd862bc0b658c1841abc68ec4cb336f596b4 100755
--- a/testsuite/expect/test29.7
+++ b/testsuite/expect/test29.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that the smd -j (--job-info) display.
diff --git a/testsuite/expect/test29.8 b/testsuite/expect/test29.8
index cde8f9986de1891d5d1c89c399ad29258ff3672d..fe526542f6b48964742c0239faf3c40395d0a834 100755
--- a/testsuite/expect/test29.8
+++ b/testsuite/expect/test29.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that the MaxSpareNodeCount is enforced
diff --git a/testsuite/expect/test3.1 b/testsuite/expect/test3.1
index e89ff5371acfe8428b6bbfcae57625e8ee361336..4eeacf257c44c19b5ac3556567ce98f5c2535e68 100755
--- a/testsuite/expect/test3.1
+++ b/testsuite/expect/test3.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol reconfigure command.
diff --git a/testsuite/expect/test3.10 b/testsuite/expect/test3.10
index d612ac48d55a135f2eb9e54493f671e3b59cbe85..06ebd7529792aa67906911f7c4da0916966990a0 100755
--- a/testsuite/expect/test3.10
+++ b/testsuite/expect/test3.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of "scontrol notify <jobid> <message>"
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index ed723520788ed923fd0088a82ca32dfa977140dd..68dfeaf95e381529c273c452929adec822b46461 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol create, delete, and update for reservations.
diff --git a/testsuite/expect/test3.12 b/testsuite/expect/test3.12
index 9847bbc93984751281d64d7296b644e526c46f16..efdcfb5c2a123cd0367420c9701a708b02a51f23 100755
--- a/testsuite/expect/test3.12
+++ b/testsuite/expect/test3.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for front end nodes.
diff --git a/testsuite/expect/test3.13 b/testsuite/expect/test3.13
index 4d6dac23766d4484a0bbbecd4619163fb718ad6b..9cb703f0858021729ff67d45a879d4103a2a1377 100755
--- a/testsuite/expect/test3.13
+++ b/testsuite/expect/test3.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for jobs.
diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2
index c2cffb5046b8af5837efd3cc4172c0121bc8ac2e..086a12e9ddc1d215b44728f56580363c88236314 100755
--- a/testsuite/expect/test3.2
+++ b/testsuite/expect/test3.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for partitions.
diff --git a/testsuite/expect/test3.3 b/testsuite/expect/test3.3
index 6c55f4c5c088fa4e6abed84c92e22c2118f8febb..a2a67e6049ab0b14189b75c0bfaa0b74936a22f9 100755
--- a/testsuite/expect/test3.3
+++ b/testsuite/expect/test3.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for nodes.
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index 925892784b50453548398380cd30c6346e6cbf86..77135b3a1dc3ff7a440826b86c197a984d24d782 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol update command for jobs.
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index 42377cd005c5c183cacdf84325956cae1575bc9c..1ccf173a06396397b51df4a4be3bb17ae44a63f8 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate scontrol create, delete, and update for partitions.
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index c88bce3d2f71020644da9bd89c2b2b9e7d199127..97761b23813001a22283fc9efe477937faa2a68f 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Testing of hidden partitions.
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index 5c3f82c2e472becda74bcf829ff0cdd99f0e65fe..ad677f3729de8056cc87be61fed4781b3a801f7b 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of job suspend/resume.
diff --git a/testsuite/expect/test3.8 b/testsuite/expect/test3.8
index e0ef3a4ad9639c56d32ad07e0150e93b0fef942a..507d11d33820a0fb3bab4a738c503edda9882f0f 100755
--- a/testsuite/expect/test3.8
+++ b/testsuite/expect/test3.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of batch job requeue.
diff --git a/testsuite/expect/test3.9 b/testsuite/expect/test3.9
index 7d2892915d0eb25a09dcf5529ff037d682ad5c68..7cee47f5b8662623c45db8dd6fc2e0023e557f30 100755
--- a/testsuite/expect/test3.9
+++ b/testsuite/expect/test3.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of "scontrol show slurmd"
diff --git a/testsuite/expect/test30.1 b/testsuite/expect/test30.1
index 010b10f5e818d97648de466d7a40ec0fae79a6d3..3c19c7f821b8e3f8a1a3ddfd23666eefca92e360 100755
--- a/testsuite/expect/test30.1
+++ b/testsuite/expect/test30.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates the rpm build is accepting the prefix and that
diff --git a/testsuite/expect/test31.1 b/testsuite/expect/test31.1
index 388a3ed8a6d91c6286cd15c3638cc8249465abc7..a1f6da317c76e94ea2d56bf2a3a15e0167ffefe5 100755
--- a/testsuite/expect/test31.1
+++ b/testsuite/expect/test31.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate proper epilog and prolog child process management.
diff --git a/testsuite/expect/test32.1 b/testsuite/expect/test32.1
index 8c44f5e103f21ea78e9b333acdc81dbe739fafd6..c4adb1dbc38ed14feed3df9319828ff2df4b60fe 100755
--- a/testsuite/expect/test32.1
+++ b/testsuite/expect/test32.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sgather usage option works (--usage option).
diff --git a/testsuite/expect/test32.10 b/testsuite/expect/test32.10
index 16f53be4a3976a55a57a2eb426fffb5aa84b2be5..b585f1764b54e672994277509ade65043f63b941 100755
--- a/testsuite/expect/test32.10
+++ b/testsuite/expect/test32.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -r copies files recursively.
diff --git a/testsuite/expect/test32.11 b/testsuite/expect/test32.11
index 781e130c9e0ef8833838943bf25235f4ca51fca4..2626b743c151e7bfd869a6823035b910535fabf2 100755
--- a/testsuite/expect/test32.11
+++ b/testsuite/expect/test32.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -v (verbose option).
diff --git a/testsuite/expect/test32.12 b/testsuite/expect/test32.12
index cdac28987f59e7dc52636de1998162489f5e62ee..1e96623b3405abbd0039bab7a7a0225cfa6e5320 100755
--- a/testsuite/expect/test32.12
+++ b/testsuite/expect/test32.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -t changes the message timeout.
diff --git a/testsuite/expect/test32.2 b/testsuite/expect/test32.2
index 6b5dd4c43fb4bb84e0169408ba851013a10a5bd0..9dfc04269c930c974bb20db76adc83a263cb9e50 100755
--- a/testsuite/expect/test32.2
+++ b/testsuite/expect/test32.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sgather help option works (--help option).
diff --git a/testsuite/expect/test32.3 b/testsuite/expect/test32.3
index 9b192a9ebe85434ce6404865db4deb9a731f38f5..91138e98723ed41eb676fe5e1f209352efe8bbae 100755
--- a/testsuite/expect/test32.3
+++ b/testsuite/expect/test32.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sgather version option works (--version option).
diff --git a/testsuite/expect/test32.4 b/testsuite/expect/test32.4
index 5deecde8f4d3f6f28cb42b2615302e764f1c53a9..141fb1cbe11bfafc889674b1889a1e89b0b524b7 100755
--- a/testsuite/expect/test32.4
+++ b/testsuite/expect/test32.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather copies specified files from compute nodes.
diff --git a/testsuite/expect/test32.5 b/testsuite/expect/test32.5
index 3059543b4dcf49653f00fa68808eb6c33105a490..72f56a2342c30d8a4415a9f58b0470657c410abe 100755
--- a/testsuite/expect/test32.5
+++ b/testsuite/expect/test32.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -k keeps the original source file.
diff --git a/testsuite/expect/test32.6 b/testsuite/expect/test32.6
index a8b6484a6e1e21dd9ff7d6802632e44b3c2f756a..4d42ebb40fdbda95e147231892b3166bad25795d 100755
--- a/testsuite/expect/test32.6
+++ b/testsuite/expect/test32.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -C compress the copied file.
diff --git a/testsuite/expect/test32.7 b/testsuite/expect/test32.7
index 0cc5fde8353241f0d5066dd88bc885ec34f31bd3..4b0f3545c04aaf9e8e2203733e1d7d5793086362 100755
--- a/testsuite/expect/test32.7
+++ b/testsuite/expect/test32.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -f ignores nonexistent source files.
diff --git a/testsuite/expect/test32.8 b/testsuite/expect/test32.8
index 22689487ea463471a2830bc59b73ff20ce080686..31310d7ddcec3db4c7e4749089c35381f9281394 100755
--- a/testsuite/expect/test32.8
+++ b/testsuite/expect/test32.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -F changes the fanout message.
diff --git a/testsuite/expect/test32.9 b/testsuite/expect/test32.9
index 2d3f62e82b1f467e5437b7959088901d99449552..209aefaa47a0a990c7b35243f13600b41207d494 100755
--- a/testsuite/expect/test32.9
+++ b/testsuite/expect/test32.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validates that sgather -p option perserves file state.
diff --git a/testsuite/expect/test33.1 b/testsuite/expect/test33.1
index ed3de206086d282622a44e14f1eec31fd172a60d..362ab4fd96cb2e18a30c1747d12b915be84eab89 100755
--- a/testsuite/expect/test33.1
+++ b/testsuite/expect/test33.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of route/topology plugin
#
diff --git a/testsuite/expect/test34.1 b/testsuite/expect/test34.1
index 11c958d818423666955d4c367f027e193d84a1ac..93041a1e1f3c4d14de223b38b49f3839efd8d3ac 100755
--- a/testsuite/expect/test34.1
+++ b/testsuite/expect/test34.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that preemption by partition is enforced
diff --git a/testsuite/expect/test34.2 b/testsuite/expect/test34.2
index 22cd14275d801b00af9879c711f03a326b653ddc..a282063adc0f6d020bb29f4eb15466a7298e15d5 100755
--- a/testsuite/expect/test34.2
+++ b/testsuite/expect/test34.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that preemption by qos is enforced
diff --git a/testsuite/expect/test4.1 b/testsuite/expect/test4.1
index fedcaa54be09a437de530ee46ae07b10487de862..0ea5cc1b9d975e018b154def6469da5ddf945d3c 100755
--- a/testsuite/expect/test4.1
+++ b/testsuite/expect/test4.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sinfo usage option works (--usage option).
diff --git a/testsuite/expect/test4.10 b/testsuite/expect/test4.10
index 95fbd43b2e3842fc484515448308a30659b5758e..cc010021ccd0f8c0328883e27cfb03ff91998b41 100755
--- a/testsuite/expect/test4.10
+++ b/testsuite/expect/test4.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sinfo reports a proper version number (--version option).
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index 798973907417a7a1a84c7b3187488a7512dfca1e..14665e1a8b110b37523c3dd92f5d729f2c276bdc 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check sinfo reason info for nodes (--list-reasons option).
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index 98d5c52b9ea6f61fcb8133f903ca0c7a61aa27b5..9e45cb739114460e6b8aac064d014dc90b122e3c 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of sinfo cpu total and allocated
diff --git a/testsuite/expect/test4.2 b/testsuite/expect/test4.2
index 005ce7666c0aab56581c88fd29b1623b00ba6193..4a74dc307efd49bff0b70fb71eb53ce7a38994d1 100755
--- a/testsuite/expect/test4.2
+++ b/testsuite/expect/test4.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sinfo help option works (--help option).
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index 8280c1563d42095af317fafdbc544c7947a64881..6972aeda82dbd8524c0790b12ffe4e7848926e49 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check partition information, both long and short (--long and
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index 577df157c4e3e5c963fb37f6a649e4139a3edb6f..cf3d53ba89adbde96bbf78ce93d2484797de85fb 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check node information, both regular and long (--Node, --long,
diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 9afc39c95f664bfde322fbd92cca2d248bb51d67..dc69be998c3fe7491ba1034682ee00b6fad3aa93 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check sinfo node information filtering (--state and --nodes
diff --git a/testsuite/expect/test4.6 b/testsuite/expect/test4.6
index b1f1e31049c78459265f3c16a566c5bf6b759601..cf4f67387470894c15c6a7becd656aff5345475a 100755
--- a/testsuite/expect/test4.6
+++ b/testsuite/expect/test4.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check sinfo iteration (--iterate option).
diff --git a/testsuite/expect/test4.7 b/testsuite/expect/test4.7
index 101f0c990bd404fe80edb448fe91047347a34107..6112c3fb3f791fd71b4359a73afa2087ae813424 100755
--- a/testsuite/expect/test4.7
+++ b/testsuite/expect/test4.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that sinfo verbose option works (--verbose option).
diff --git a/testsuite/expect/test4.8 b/testsuite/expect/test4.8
index 3fcc57c295fc7741fcda6195d958c7c0bbc3464f..559a354550a0b1f6094682cdd8b1dbf3ddd6318d 100755
--- a/testsuite/expect/test4.8
+++ b/testsuite/expect/test4.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check sinfo output without header (--noheader option).
diff --git a/testsuite/expect/test4.9 b/testsuite/expect/test4.9
index 8f35faa54a20efa3ddacc5bb2673bf9114f7ce13..c0b2417813dfe7a83dcccd4b5d406bda56ae8589 100755
--- a/testsuite/expect/test4.9
+++ b/testsuite/expect/test4.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check sinfo formating options (--format option and SINFO_FORMAT
diff --git a/testsuite/expect/test5.1 b/testsuite/expect/test5.1
index c20486e516b870f71a19f9ef237a8b9380d9ac19..dc2734d002a7b4084700be8e6ee5ab54bb306641 100755
--- a/testsuite/expect/test5.1
+++ b/testsuite/expect/test5.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that squeue usage option works (--usage option).
diff --git a/testsuite/expect/test5.10 b/testsuite/expect/test5.10
index ee334ccbbc43c86b1e9c22d18736d5a2fc77bf15..38bf086029d456f77f45338507cc6da81390d803 100755
--- a/testsuite/expect/test5.10
+++ b/testsuite/expect/test5.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that squeue --priority lists each job per partition
diff --git a/testsuite/expect/test5.2 b/testsuite/expect/test5.2
index 34a00a722df1de9523ec533c4986b34828db0c45..70dddbcdb0a776f5f9f26a11a1339f699f546863 100755
--- a/testsuite/expect/test5.2
+++ b/testsuite/expect/test5.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that squeue help option works (--help option).
diff --git a/testsuite/expect/test5.3 b/testsuite/expect/test5.3
index aaa166fec4e161cf60d7bf5b129c846da519a80e..7e0aa8e7aa2b3c79e9cd13dab503f06bc7e3edd2 100755
--- a/testsuite/expect/test5.3
+++ b/testsuite/expect/test5.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check squeue iteration (--iterate option).
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index 298a4d172852568e5ffa559f4b6c7fa0e8a57b9d..12f11a5735b6be890e2c0c5196f132a1c95fbaba 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Check squeue formating options (--noheader, --format and --step
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index f5ad720ac9c1bda48f649012f45df550dab35daf..7fef4392db0fbc481d5d297effa92635eadd6558 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test squeue sorting (--sort option).
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 4fe514ddc56c0c01504e91bc69d82bb66b489641..60c44374f42b92e096253027152abe448c73cb4f 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test squeue filtering (--jobs, --nodelist, --states, --steps and
diff --git a/testsuite/expect/test5.7 b/testsuite/expect/test5.7
index 967549c79bdc83c89de7884b7ae024578490c91b..f3db462e46ae8d204cf68f401276cfe55ed40cf8 100755
--- a/testsuite/expect/test5.7
+++ b/testsuite/expect/test5.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that squeue verbose option works (--verbose option).
diff --git a/testsuite/expect/test5.8 b/testsuite/expect/test5.8
index 2382410009ecd0d27b61e65b1c79d9b06aa8a41e..dbf3b48dcf16dfe861b5b65918d1f043a4280a1b 100755
--- a/testsuite/expect/test5.8
+++ b/testsuite/expect/test5.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that squeue reports a proper version number (--version option).
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 84e86b5124455348d1cda585c463d7d09e804b9b..58d84f0a52a4828279273b7933ad2d0a39e86561 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Validate that squeue -O (--Format) option displays the
diff --git a/testsuite/expect/test6.1 b/testsuite/expect/test6.1
index f40841ac80452cb1c73ba384457c529c3194ba2a..d96541978111a3549637eab834a5973d0c4eb3de 100755
--- a/testsuite/expect/test6.1
+++ b/testsuite/expect/test6.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that scancel usage option works (--usage option).
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index 10a6b463e6db682594a951067ab5f13a695d9de7..3bee9b358e61f2373d439169913b1d54faa954c4 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel user and partition filters, delete all remaining jobs
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index 1028dbf31e263d3b5d17b636471ac15a1e0049f4..29abed061fd820b867b70b5c9d6c47c60e0408d5 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of scancel quiet option (--quiet option).
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index 46cd3d99c7b802d907c557189a2ef4c35b3cdb26..d42c850d206e5ba19427f42cc1880d155ec8eb97 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel signal to batch script (--batch option)
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index 987550081e6bca12b124580e89cad156daf60f05..7410f36713b487e3b63d554f1a751b5d9f327893 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test routing all signals through slurmctld rather than directly
diff --git a/testsuite/expect/test6.14 b/testsuite/expect/test6.14
index 89b9445f9bd08b7acd3549fc69ea8e612daea6e9..08a35d7e7eb86d20937e202fffa1a538d96746bd 100755
--- a/testsuite/expect/test6.14
+++ b/testsuite/expect/test6.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel --nodelist option.
diff --git a/testsuite/expect/test6.2 b/testsuite/expect/test6.2
index 251da2b2ca44770faec4eef9747cd6c2aa7c5fb5..8eec22ef3d4e7338dde3bb36bfd498a6b7713882 100755
--- a/testsuite/expect/test6.2
+++ b/testsuite/expect/test6.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that scancel help option works (--help option).
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index 18d7f869330af1cf269f59090c719c7c38620972..84300c3ab62b836a07d1e2ef68d29d1a958340c3 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel interactive mode (--interactive option).
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index 71e8d0130a45d28e608162039cc61a42344f0b2f..27ee6f0a05f9072f7dab194c8ffc6e0760d773ee 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel job name filter (--name option).
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 20d6ff823c610db81289d545226b76a901c2736b..63d4edf5a4714cfc8418d8f03716b01bdddf7ab8 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel verbose option (--verbose option).
diff --git a/testsuite/expect/test6.6 b/testsuite/expect/test6.6
index e99693568423617f69af0f5e17ec2bbc067c276d..5c48a5a72360615220fab381941d2782be65eed5 100755
--- a/testsuite/expect/test6.6
+++ b/testsuite/expect/test6.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Confirm that scancel reports a proper version number (-V option).
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index 0ebf4e3540ff6ae960f52d0353b4cea8106a020d..a7a3ee87e6963722796df3090a2c5ffa20e7af46 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel signal option (--signal and --verbose options).
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 79a30b1227375caef408ac3e340d6fc2611c683e..9ca7161ef14546964d643f3e42cc7a72a44863fc 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel state and name filters (--state and --name options).
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 68cc46fa6964f31d68c8429cedbbe15f6b297a0a..ed2f6d4b08f73f02013133be0172914fc89a7fea 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test scancel of individual job steps (job.step specification).
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index caee5d52afeb6e1048b016e7ca1fd996d43ba7a9..37190c81035d1b7b5092c7c4a5aa3e38cc16cd43 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test priorities assigned to jobs. Uses srun --hold and --batch options.
diff --git a/testsuite/expect/test7.10 b/testsuite/expect/test7.10
index ad60c9c1878bdb325837ae42505d05fc10d74051..cb6956ea3ca02a4d03bc8783aa5f3844674cb755 100755
--- a/testsuite/expect/test7.10
+++ b/testsuite/expect/test7.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test if we can trick SLURM into using the wrong user ID
diff --git a/testsuite/expect/test7.11 b/testsuite/expect/test7.11
index 7ea39f099881d5b71347806e931844531852e16f..75d0ed483881fac0e24d04454484edc3c415c5bf 100755
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of SPANK plugin
diff --git a/testsuite/expect/test7.12 b/testsuite/expect/test7.12
index 4cff160e0da275e2634812610083245c186729f9..34bca00e9a492417ab606c27b01569a9aba95944 100755
--- a/testsuite/expect/test7.12
+++ b/testsuite/expect/test7.12
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of slurm_job_step_stat() and slurm_load_job() API calls.
#
diff --git a/testsuite/expect/test7.13 b/testsuite/expect/test7.13
index 555b7b554409725699166f400c7bf63cc02ae74d..615f5ad2dca88b5006d2b88f2a7dfe314366cf2b 100755
--- a/testsuite/expect/test7.13
+++ b/testsuite/expect/test7.13
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Verify the correct setting of a job's ExitCode.
#
diff --git a/testsuite/expect/test7.14 b/testsuite/expect/test7.14
index 1da21dd3ea948df7c8f08b192147d14ad73ea92f..3989ced7f72eac1dd0cb9abb9870d6331056b7d4 100755
--- a/testsuite/expect/test7.14
+++ b/testsuite/expect/test7.14
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Verify the ability to modify the Derived Exit Code and Comment
# fields of a job record in the database.
diff --git a/testsuite/expect/test7.15 b/testsuite/expect/test7.15
index 9b01bc0f62fa559d6d726093b07fcf417c2718f1..28ab074fc84251296cce50a37f3ed9aaed5ad79d 100755
--- a/testsuite/expect/test7.15
+++ b/testsuite/expect/test7.15
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Verify signal mask of tasks have no ignored signals.
#
diff --git a/testsuite/expect/test7.16 b/testsuite/expect/test7.16
index e1034626d5e1e873ed1464cc88876b9b10535ddd..bab4e167a3e1118eb70d19577b3007dde3ba97b3 100755
--- a/testsuite/expect/test7.16
+++ b/testsuite/expect/test7.16
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Verify that auth/munge credential is properly validated.
diff --git a/testsuite/expect/test7.17 b/testsuite/expect/test7.17
index 314256f91dd0d9d7875a710b129efd39c1ad7aef..500198fc60570641d5fdb0f540b970d0c44bfcd2 100755
--- a/testsuite/expect/test7.17
+++ b/testsuite/expect/test7.17
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test GRES APIs.
#
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index d179252ffefa99db87b40f6dcc081f20c6fc9181..ee038dcab02d9579c7c028264c89e83883c4a807 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of PMI functions available via API library. Tests
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index c42f7f6d26512d6d7b3e795494212013db1e79ba..ae8b0f22b3c147e6db9f6c9029ab25c898f82c1e 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of slurm_spawn API (needed on IBM SP systems).
#
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index 6f9bd0265d9a11cd6d34a622832bfe51372ded93..b17aab7b6c01299c1e51fa70ee8cdffa6c67e843 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of TotalView operation with srun, with and without bulk
diff --git a/testsuite/expect/test7.5 b/testsuite/expect/test7.5
index fd07e680135c4cb844606ba3f6018beb1b18f0e0..41db5bfd0d3c896bd4980ddf8616cf9f53c8ea68 100755
--- a/testsuite/expect/test7.5
+++ b/testsuite/expect/test7.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of TotalView termination logic for srun.
#
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index aca96dec72d30a2926d05bbc81bf31cfc179e04d..c8944a3001294374b7a717fe3eed172fb9ac4ce7 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of TotalView operation with sattach
diff --git a/testsuite/expect/test7.7 b/testsuite/expect/test7.7
index 3021ef8cb347058612bb972207e3c4b517c0ed3b..44af1252247fff2f2b4c59fa5d28d25cc72619ac 100755
--- a/testsuite/expect/test7.7
+++ b/testsuite/expect/test7.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of sched/wiki2 plugin. This is intended to execute in the
diff --git a/testsuite/expect/test7.8 b/testsuite/expect/test7.8
index 4039866d32b6b61f1ace8950c85462128a540692..5ea592ec69af56315b0b4066e24b06725f1dfdd0 100755
--- a/testsuite/expect/test7.8
+++ b/testsuite/expect/test7.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of sched/wiki plugin. This is intended to execute in the
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index 476857830c5c5abd1124975cbe039912103038f1..bfbfd011da766fd6666819119887c3c95f73e3e2 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test that no files are open in spawned tasks (except stdin,
diff --git a/testsuite/expect/test8.1 b/testsuite/expect/test8.1
index 5f652caa6ff30a9cbd0e3d7b134fc0d51a352cf2..688572f111f7254a8ea28a600ce62e8fac60c11d 100755
--- a/testsuite/expect/test8.1
+++ b/testsuite/expect/test8.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of Blue Gene specific sbatch command line options
diff --git a/testsuite/expect/test8.10 b/testsuite/expect/test8.10
index 4eaa771667f27638bee9c8ee1163e8a4256e81b9..60cc42d26c3836fe8b09b51d4635cc48676bda9c 100755
--- a/testsuite/expect/test8.10
+++ b/testsuite/expect/test8.10
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test to make sure that the correct number of
diff --git a/testsuite/expect/test8.11 b/testsuite/expect/test8.11
index dfd5dc6b72f82d42e98d3a5b2b52664c16c6da5a..851bb964794d56b18926d2308140835d20889623 100755
--- a/testsuite/expect/test8.11
+++ b/testsuite/expect/test8.11
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test that checks that certain number of tasks
diff --git a/testsuite/expect/test8.2 b/testsuite/expect/test8.2
index 312b8a7715d04da6f28b13cf30da29a545f0288f..592b17666a6af8c93cb2cc1f4af4f5f54fe8cf6b 100755
--- a/testsuite/expect/test8.2
+++ b/testsuite/expect/test8.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of Blue Gene specific sbatch environment variables
diff --git a/testsuite/expect/test8.20 b/testsuite/expect/test8.20
index b7327cf0a4605eca18b24d301185714cf125e78b..2748d6138549197e6cdf65bfbf4c2a44deff4b73 100755
--- a/testsuite/expect/test8.20
+++ b/testsuite/expect/test8.20
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test that job step allocations are a valid size
diff --git a/testsuite/expect/test8.21 b/testsuite/expect/test8.21
index ea8acda8b5bf1db145dc69d76d01460ec29aab19..0a8941473ea38b0925aca38603876192b1bac30f 100755
--- a/testsuite/expect/test8.21
+++ b/testsuite/expect/test8.21
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test that multple job step allocations are
diff --git a/testsuite/expect/test8.21.bash b/testsuite/expect/test8.21.bash
index 206759c8ff280357a02f08ab44d67d5c3e478f4b..8fb666d19086e82f2c74554acc2d89ada2b918d4 100755
--- a/testsuite/expect/test8.21.bash
+++ b/testsuite/expect/test8.21.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ $# -ne 5 ]; then
echo "test8.21.bash <srun_path> <squeue_path> <job_id> <job_size> <mode:1|2?"
diff --git a/testsuite/expect/test8.22 b/testsuite/expect/test8.22
index 78e51354180944a799688edbd3b54dc379bd3d11..9fbbc25cca6bf8d2f6e4c41c0e8470266f21b234 100755
--- a/testsuite/expect/test8.22
+++ b/testsuite/expect/test8.22
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Stress test of running many job step allocations
diff --git a/testsuite/expect/test8.23 b/testsuite/expect/test8.23
index d4e3c9bba2d926f935d8b5afbad9985f1d63dbbc..3cc26fbf93736cf4800119a73a04e2624fc250fb 100755
--- a/testsuite/expect/test8.23
+++ b/testsuite/expect/test8.23
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test that multple jobs allocations are properly
diff --git a/testsuite/expect/test8.24 b/testsuite/expect/test8.24
index 58e76998a20edbc8f2c792990ec14b02f92997fe..66a2ebca9a8df5c9dc7dde8297f8c124d4d76aeb 100755
--- a/testsuite/expect/test8.24
+++ b/testsuite/expect/test8.24
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test advanced reservation creation with mutliple
diff --git a/testsuite/expect/test8.25 b/testsuite/expect/test8.25
index fb0c149739ece19809f32f41bb8baf4cc351260e..61a602f4c635ba2b0bfc6cf4e3b95440575d61b2 100755
--- a/testsuite/expect/test8.25
+++ b/testsuite/expect/test8.25
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/P only: Confirm that salloc can reserve the HTC partitons.
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index 1f24651582eb0b2f806a125582829e18773fe524..d81043df852a78e38ee34e58a3bd4fe327ed0070 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of Blue Gene specific job geometry support
diff --git a/testsuite/expect/test8.4 b/testsuite/expect/test8.4
index fadefc82c941e9d8c261dd86eb8ecd02ddddeb0c..317604f8200560391291e33d4ae46727bd799b02 100755
--- a/testsuite/expect/test8.4
+++ b/testsuite/expect/test8.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of Blue Gene MPI job execution
diff --git a/testsuite/expect/test8.5 b/testsuite/expect/test8.5
index d5a959630f36748eab2830f506b5413f4d66dc46..c9d549567bfa289a7389b1eb136271af81d5384c 100755
--- a/testsuite/expect/test8.5
+++ b/testsuite/expect/test8.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of BLUEGENE SLURM functionality
# Test creation of all blocks 1 midplane and smaller.
diff --git a/testsuite/expect/test8.6 b/testsuite/expect/test8.6
index 059bd42f2c94bed57b8bdd9950722d7f256c71d9..94c1fb55119bf38554f723d3e67bb5f9e5d7129a 100755
--- a/testsuite/expect/test8.6
+++ b/testsuite/expect/test8.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of BLUEGENE SLURM functionality
# Stress test Dynamic mode block creation.
diff --git a/testsuite/expect/test8.7 b/testsuite/expect/test8.7
index 061a96bc80366054a33c715e9314c1e6c9ff8999..d584736f90baa3cca465b88d23a0a016d9939d5b 100755
--- a/testsuite/expect/test8.7
+++ b/testsuite/expect/test8.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Test of Blue Gene scheduling with sched/wik2 plugin.
diff --git a/testsuite/expect/test8.8 b/testsuite/expect/test8.8
index f78383340a0d53bf2ca2c59914b1cf1992bd6312..dbf4e280fa089789c17865a032ed66b82e850961 100755
--- a/testsuite/expect/test8.8
+++ b/testsuite/expect/test8.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of BLUEGENE SLURM functionality
# Test result of marking smaller blocks in an error state.
diff --git a/testsuite/expect/test8.9 b/testsuite/expect/test8.9
index 5ea2d39f75f32b8207a052b77c4c48c52c4274f7..56e50672e7ef24f0a68ac1c65eae889077a17716 100755
--- a/testsuite/expect/test8.9
+++ b/testsuite/expect/test8.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Test of SLURM functionality
# Bluegene/Q only: Test to make sure if a nodeboard goes unavailable
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 6004776f5fadc0f2b37795237e3af1436decf60f..f92d1002cdb7e7405d113a649bc270a1b4318921 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test of stdin broadcast
#
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index 9430715c3c1c4119dbc50b31e862604ce0217ff2..0c5b2c474d8ef3d9c12371d11e2b307597352aed 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test of stdout with stdin closed
#
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 4cd15a49890f759779f94e6904a43f80f3ab7dbb..f3dbac40704e8b2138b94c8fa5a6e93d680c8ab6 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test of per-task output files with stdin closed
#
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index 31acec014e56b7eade4e11bf444e10248fcb2480..f1a680b7512df729e3933a9be8a8b94972b14e22 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
#############################################################################
# Purpose: Stress test of per-task output and input files
#
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index c916b93a45db278d4f24b4608d81d20de24dd05c..7c1c2b02e813abd9c182450250e3894b53558c1c 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test of per-task input files
#
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index a2bd257c50f8783df9349de7d09a1164bdafd11c..85b9271ddb3d29e3ce5720490bae7797e1e32e63 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test of per-task output files
#
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index 1f7b41780a520e3816b8ee8a8663cbd239f99560..59c0162d5d0ed769a7085260583fd83a38b14983 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test multiple simultaneous commands via multiple threads
#
diff --git a/testsuite/expect/test9.7.bash b/testsuite/expect/test9.7.bash
index a6bf6304689054b52aee451621583a8c2253b844..990cbb213a27393fe195f49f28239911f287c2a5 100755
--- a/testsuite/expect/test9.7.bash
+++ b/testsuite/expect/test9.7.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
############################################################################
# Simple SLURM stress test
# Usage: <prog> <exec1> <exec2> <exec3> <sleep_time> <iterations>
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index c828f9a369715ac8cb01c63138f0c558b3131104..d10c0b2e94777b373fac7abf4c2691946c3beb3d 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Stress test with maximum slurmctld message concurrency.
# We start a large number of job steps, the simultaneously
diff --git a/testsuite/expect/test9.9 b/testsuite/expect/test9.9
index 2b363912867a36db1837301b7dfc29597ea537eb..b25e5bd696be4eb4cf62f6156dd587d78b3fd943 100755
--- a/testsuite/expect/test9.9
+++ b/testsuite/expect/test9.9
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
############################################################################
# Purpose: Timing test for 5000 jobs.
#
diff --git a/testsuite/expect/test9.9.bash b/testsuite/expect/test9.9.bash
index f0420f02166e00c95ae45db6a188a37d672d64ef..be18ffcf3550fe9879466c99653442a5b81c4de5 100755
--- a/testsuite/expect/test9.9.bash
+++ b/testsuite/expect/test9.9.bash
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ $# != 4 ]
then
diff --git a/testsuite/slurm_unit/common/runall.exp b/testsuite/slurm_unit/common/runall.exp
index f71789038bfc12db03ccc53ea0fdc08f5061b62e..131d341bc342d777c24ad246631bab915eb62bac 100755
--- a/testsuite/slurm_unit/common/runall.exp
+++ b/testsuite/slurm_unit/common/runall.exp
@@ -1,4 +1,4 @@
-#!/usr/bin/expect
+#!/usr/bin/env expect
load_lib "dejagnu.exp"
# Uncomment these for debugging help