diff --git a/testsuite/expect/README b/testsuite/expect/README
index 3bf9269e2a6dd4b4973f7c7f6632a8d5e908a938..b36ad781d13a9ff6d0c634e73eaa68e14b10eef1 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -316,4 +316,6 @@ test14.4   Test sbcast file overwrite (--force option).
 test14.5   Test sbcast time preservation (--preserve option).
 test14.6   Test sbcast logging (--verbose option).
 test14.7   Test sbcast security issues.
+test14.8   Test sbcast transmission buffer options (--size and 
+           --fanout options).
 
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
new file mode 100755
index 0000000000000000000000000000000000000000..b33848ee48d14867c758191ae93e55ce8b21751c
--- /dev/null
+++ b/testsuite/expect/test14.8
@@ -0,0 +1,132 @@
+#!/usr/bin/expect
+############################################################################
+# Purpose: Test of SLURM functionality
+#          Test sbcast transmission buffer options (--size and
+#          --fanout options).
+#
+# 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.
+#
+# Note:    This script generates and then deletes files in the working directory 
+#          named test14.8.input and test14.8.output
+############################################################################
+# Copyright (C) 2006 The Regents of the University of California.
+# Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
+# Written by Morris Jette <jette1@llnl.gov>
+# UCRL-CODE-217948.
+# 
+# This file is part of SLURM, a resource management program.
+# For details, see <http://www.llnl.gov/linux/slurm/>.
+#  
+# 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.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.
+############################################################################
+source ./globals
+
+set test_id     "14.8"
+set file_in     "test$test_id.input"
+set file_out    "test$test_id.output"
+
+set exit_code            0
+set job_id               0
+
+print_header $test_id
+
+if {[test_front_end] != 0} {
+	send_user "\nWARNING: This test is incompatable with front-end systems\n"
+	exit 0
+}
+
+#
+# Delete left-over input script plus stdout file
+# Build input script file that broacasts a file
+#
+exec $bin_rm -f $file_in $file_out
+exec echo "#!$bin_bash"					 >$file_in
+#
+exec echo "$srun $bin_rm -f /tmp/test1.$test_id"		>>$file_in
+exec echo "$sbcast $sbcast --fanout=2 /tmp/test1.$test_id"	>>$file_in
+exec echo "$srun $bin_diff $sbcast /tmp/test1.$test_id" 	>>$file_in
+exec echo "$srun $bin_rm -f /tmp/test1.$test_id"		>>$file_in
+#
+exec echo "$srun $bin_rm -f /tmp/test2.$test_id"		>>$file_in
+exec echo "$sbcast $sbcast --size=16k  /tmp/test2.$test_id"	>>$file_in
+exec echo "$srun $bin_diff $sbcast /tmp/test2.$test_id"		>>$file_in
+exec echo "$srun $bin_rm -f /tmp/test2.$test_id"		>>$file_in
+#
+exec $bin_chmod 700 $file_in
+
+#
+# Spawn a srun batch job that uses stdout and confirm its contents
+#
+set timeout $max_job_delay
+spawn $srun -N1-4 --batch --output=$file_out -t1 $file_in
+expect {
+	-re "jobid ($number) submitted" {
+		set job_id $expect_out(1,string)
+		exp_continue
+	}
+	timeout {
+		send_user "\nFAILURE: srun not responding\n"
+		kill_srun
+		set exit_code 1
+		exp_continue
+	}
+	eof {
+		wait
+	}
+}
+
+if {$job_id == 0} {
+	send_user "\nFAILURE: batch submit failure\n"
+	exit 1
+}
+
+#
+# Wait for job to complete and check output file
+#
+if {[wait_for_job $job_id "DONE"] != 0} {
+	send_user "\nFAILURE: waiting for job to complete\n"
+	set exit_code 1
+}
+
+if {[wait_for_file $file_out] == 0} {
+	spawn $bin_cat $file_out
+	expect {
+		-re "differ" {
+			send_user "\nFAILURE: sbcast transmitted file differs from original\n"
+			set exit_code 1
+			exp_continue
+		}
+		-re "no such" {
+			send_user "\nFAILURE: sbcast failed to transmit the file\n"
+			set exit_code 1
+		}
+		-re "error" {
+			send_user "\nFAILURE: some error occurred\n"
+			set exit_code 1
+			exp_continue
+		}
+		eof {
+			wait
+		}
+	}
+}
+
+if {$exit_code == 0} {
+	#exec $bin_rm -f $file_in $file_out
+	send_user "\nSUCCESS\n"
+}
+exit $exit_code