diff --git a/testsuite/expect/Makefile.am b/testsuite/expect/Makefile.am
index 471aa48880a6ca0f7c0e0d7131334b844f5243de..961d9f116808e88dccd66542e9efacb470d72533 100644
--- a/testsuite/expect/Makefile.am
+++ b/testsuite/expect/Makefile.am
@@ -281,6 +281,7 @@ EXTRA_DIST = \
test7.17_configs/test7.17.7/slurm.conf \
test7.18 \
test7.18.prog.c \
+ test7.19 \
test9.1 \
test9.2 \
test9.3 \
diff --git a/testsuite/expect/Makefile.in b/testsuite/expect/Makefile.in
index 02379fcb22bf907c408bddb9bed2c52848e4342a..99ae212ed4825b441d285c9a72edbb5dfb34f44d 100644
--- a/testsuite/expect/Makefile.in
+++ b/testsuite/expect/Makefile.in
@@ -703,6 +703,7 @@ EXTRA_DIST = \
test7.17_configs/test7.17.7/slurm.conf \
test7.18 \
test7.18.prog.c \
+ test7.19 \
test9.1 \
test9.2 \
test9.3 \
diff --git a/testsuite/expect/README b/testsuite/expect/README
index 98632198f3a49d41bd8e1812ea343592200e4294..14215837ef87aa10150599e1a78dc0ccc2bf5e52 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -367,7 +367,7 @@ test7.15 Verify signal mask of tasks have no ignored signals.
test7.16 Verify that auth/munge credential is properly validated.
test7.17 Test GRES APIs.
test7.18 Test of slurm_hostlist_find().
-
+test7.19 Test sbatch/srun/salloc path resolving
test9.# System stress testing. Exercises all commands and daemons.
=====================================================================
diff --git a/testsuite/expect/test7.19 b/testsuite/expect/test7.19
new file mode 100755
index 0000000000000000000000000000000000000000..916abe31eb6f4f20900a8e96225d47adf911db55
--- /dev/null
+++ b/testsuite/expect/test7.19
@@ -0,0 +1,223 @@
+#!/usr/bin/env expect
+############################################################################
+# Purpose: Test sbatch/srun/salloc path resolving
+#
+# Output: "TEST: #.#" followed by "SUCCESS" if test was successful, OR
+# "FAILURE: ..." otherwise with an explanation of the failure, OR
+# anything else indicates a failure mode that must be investigated.
+############################################################################
+# Copyright (C) 2019 SchedMD LLC.
+# Written by Nathan Rini <nate@schedmd.com>
+#
+# This file is part of Slurm, a resource management program.
+# For details, see <https://slurm.schedmd.com/>.
+# Please also read the included file: DISCLAIMER.
+#
+# Slurm is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free
+# Software Foundation; either version 2 of the License, or (at your option)
+# any later version.
+#
+# Slurm is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# 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.
+############################################################################
+
+source ./globals
+
+set test_id "7.19"
+set file_in "bash"
+
+print_header $test_id
+
+proc test_sbatch { local } {
+ global sbatch number file_in
+
+ set rc -12345
+ set job_id 0
+
+ if { $local } {
+ set file_in_loc "./$file_in"
+ set exp_rc 0
+ } else {
+ set file_in_loc "$file_in"
+ set exp_rc 1
+ }
+ spawn $sbatch -W -t1 --wrap "$file_in_loc -c /bin/false"
+ expect {
+ -re "Submitted batch job ($number)" {
+ set job_id $expect_out(1,string)
+ exp_continue
+ }
+ -re "error" {
+ log_warn "sbatch job was not submitted"
+ return 1
+ }
+ timeout {
+ log_error "sbatch not responding"
+ return 1
+ }
+ eof {
+ lassign [wait] pid spawnid os_error_flag rc
+ }
+ }
+
+ if { $job_id == 0 } {
+ log_error "batch submit failure"
+ return 1
+ }
+
+ if {$rc != 0 } {
+ send_user "\nThis error is expected, not a problem\n"
+ }
+
+ if { $rc != $exp_rc } {
+ log_error "sbatch error submitting job $job_id rc: $rc instead of $exp_rc\n"
+ return 1
+ }
+
+ return 0
+}
+
+proc test_salloc { local } {
+ global salloc number file_in
+
+ set rc -12345
+ set job_id 0
+
+ if { $local } {
+ set file_in_loc "./$file_in"
+ set exp_rc 0
+ } else {
+ set file_in_loc "$file_in"
+ set exp_rc 1
+ }
+ spawn $salloc -t1 $file_in_loc -c /bin/false
+ expect {
+ -re "salloc: Granted job allocation ($number)" {
+ set job_id $expect_out(1,string)
+ exp_continue
+ }
+ -re "error" {
+ log_warn "FAILURE: Job was not submitted"
+ return 1
+ }
+ timeout {
+ log_error "salloc not responding"
+ return 1
+ }
+ eof {
+ lassign [wait] pid spawnid os_error_flag rc
+ }
+ }
+
+ if { $job_id == 0 } {
+ log_error "FAILURE: salloc submit failure"
+ return 1
+ }
+
+ if {$rc != 0 } {
+ send_user "\nThis error is expected, not a problem\n"
+ }
+
+ if { $rc != $exp_rc } {
+ log_error "salloc error submitting job $job_id rc: $rc instead of $exp_rc\n"
+ return 1
+ }
+
+ return 0
+}
+
+proc test_srun { local } {
+ global srun number file_in
+
+ set rc -12345
+ set job_id 0
+
+ if { $local } {
+ set file_in_loc "./$file_in"
+ set exp_rc 0
+ } else {
+ set file_in_loc "$file_in"
+ set exp_rc 1
+ }
+ spawn $srun -v -t1 $file_in_loc -c /bin/false
+ expect {
+ -re "launching ($number).($number)" {
+ set job_id $expect_out(1,string)
+ exp_continue
+ }
+ timeout {
+ log_error "srun not responding"
+ return 1
+ }
+ eof {
+ lassign [wait] pid spawnid os_error_flag rc
+ }
+ }
+
+
+ if { $job_id == 0 } {
+ log_error "srun submit failure"
+ return 1
+ }
+
+ if {$rc != 0 } {
+ send_user "\nThis error is expected, not a problem\n"
+ }
+
+ if { $rc != $exp_rc } {
+ log_error "srun error submitting job $job_id rc: $rc instead of $exp_rc\n"
+ return 1
+ }
+
+ return 0
+}
+
+set ::env(PATH) "/bin:/usr/bin"
+
+make_bash_script $file_in "/bin/true"
+
+# Test tools expecting bash to be used instead of our local 'bash' script
+if { [test_sbatch 0] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+if { [test_salloc 0] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+if { [test_srun 0] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+# Test tools expecting our local 'bash' script to override the system bash
+if { [test_sbatch 1] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+if { [test_salloc 1] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+if { [test_srun 1] } {
+ exec $bin_rm $file_in
+ exit 1
+}
+
+#cleanup
+exec $bin_rm $file_in
+
+send_user "\nSUCCESS\n"
+
+exit 0