diff --git a/src/self-test b/src/self-test
index 554aceb..8fabe5d 100755
--- a/src/self-test
+++ b/src/self-test
@@ -2,18 +2,19 @@
 
 MINIMODEM="${MINIMODEM-./minimodem}"
 
-[ $# -eq 2 ] || {
-    echo "usage: self-test baudmode textfile" 1>&2
+[ $# -ge 2 ] || {
+    echo "usage: self-test textfile minimodem_args" 1>&2
     exit 1
 }
-baudmode="$1"
-textfile="$2"
+textfile="$1"
+shift
+minimodem_args="$*"
 
 TMPF="/tmp/minimodem-test-$$.wav"
 trap "rm -f $TMPF" 0
 
 set -e
-$MINIMODEM --tx -T 1 --file $TMPF "$baudmode" < "$textfile"
+$MINIMODEM --tx -T 1 --file $TMPF $minimodem_args < "$textfile"
 # ls -l $TMPF
-$MINIMODEM --rx --file $TMPF "$baudmode" | diff "$textfile" -
+$MINIMODEM --rx --file $TMPF $minimodem_args | diff "$textfile" -
 
diff --git a/src/testcases/test.01-self-test-1200 b/src/testcases/test.01-self-test-1200
index 93989d0..c0a0f04 100755
--- a/src/testcases/test.01-self-test-1200
+++ b/src/testcases/test.01-self-test-1200
@@ -1,2 +1,2 @@
 # use fsk.c as the sample text file
-exec ./self-test 1200 fsk.c
+exec ./self-test fsk.c 1200
diff --git a/src/testcases/test.02-self-test-300 b/src/testcases/test.02-self-test-300
index 618b0b9..d1f5c6d 100755
--- a/src/testcases/test.02-self-test-300
+++ b/src/testcases/test.02-self-test-300
@@ -1 +1 @@
-exec ./self-test 300 testcases/self-test-ascii.txt
+exec ./self-test testcases/self-test-ascii.txt 300
diff --git a/src/testcases/test.03-self-test-rtty b/src/testcases/test.03-self-test-rtty
index 7576d75..60b45f5 100755
--- a/src/testcases/test.03-self-test-rtty
+++ b/src/testcases/test.03-self-test-rtty
@@ -1,2 +1,2 @@
 # use self-test-baudot.txt as the sample text file
-exec ./self-test rtty testcases/self-test-baudot.txt
+exec ./self-test testcases/self-test-baudot.txt rtty
diff --git a/src/testcases/test.04-self-test-0.5 b/src/testcases/test.04-self-test-0.5
index a45bff5..b386d8d 100755
--- a/src/testcases/test.04-self-test-0.5
+++ b/src/testcases/test.04-self-test-0.5
@@ -2,4 +2,4 @@
 TMPF=/tmp/minimodem-test.$$
 trap "rm -f $TMPF" 0
 echo "KAMAL" > $TMPF
-./self-test 0.5 $TMPF
+./self-test $TMPF 0.5
diff --git a/src/testcases/test.05-self-test-12000 b/src/testcases/test.05-self-test-12000
index 504add3..21c6994 100755
--- a/src/testcases/test.05-self-test-12000
+++ b/src/testcases/test.05-self-test-12000
@@ -1 +1 @@
-exec ./self-test 12000 testcases/self-test-ascii.txt
+exec ./self-test testcases/self-test-ascii.txt 12000