diff --git a/testsuite/expect/test18.12 b/testsuite/expect/test18.12
index 42ce05ac926df3e6245046c3816849543743cc27..c508154358ba84a107ac2ffefef5632a63bc94a6 100755
--- a/testsuite/expect/test18.12
+++ b/testsuite/expect/test18.12
@@ -1,7 +1,7 @@
 #!/usr/bin/expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Test slaunch stdin routing to specific task (--local-input option 
+#          Test slaunch stdin routing to specific task (--slaunch-input option 
 #          with numeric argument).
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -44,7 +44,7 @@ print_header $test_id
 # Spawn a shell via slaunch
 #
 set timeout $max_job_delay
-spawn $salloc -v -N1 -t1 $slaunch -n10 --overcommit --wait=2 --local-input=3 $bin_bash
+spawn $salloc -v -N1 -t1 $slaunch -n10 --overcommit --wait=2 --slaunch-input-filter=3 $bin_bash
 expect {
 	-re "Granted job allocation ($number)" {
 		set job_id $expect_out(1,string)
diff --git a/testsuite/expect/test18.20 b/testsuite/expect/test18.20
index a764b8ad4817ead537403aa450afd9fdf51f4c93..ffd4e7e76aec091288326d80502d66d6a902a0a8 100755
--- a/testsuite/expect/test18.20
+++ b/testsuite/expect/test18.20
@@ -56,7 +56,7 @@ proc run_cat_backpressure { input_file output_file } {
 	set iter 0
 
 	set output [open $output_file w]
-	set slaunch_output [open "| $salloc -N1 -t2 $slaunch --remote-error=$file_err $bin_cat $input_file" r]
+	set slaunch_output [open "| $salloc -N1 -t2 $slaunch --task-error=$file_err $bin_cat $input_file" r]
 	while {![eof $slaunch_output]} {
 		puts -nonewline $output [read $slaunch_output 1]
 		incr iter