diff --git a/src/Makefile.am b/src/Makefile.am
index 18897a4..27b44b0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = $(DEPS_CFLAGS)
 
 bin_PROGRAMS = minimodem
 
-EXTRA_DIST = self-test # run-test
+EXTRA_DIST = self-test self-test-baudot.txt # run-test
 
 
 SIMPLEAUDIO_SRC = \
@@ -33,3 +33,15 @@ minimodem_LDADD = $(DEPS_LIBS)
 minimodem_SOURCES = minimodem.c $(BAUDOT_SRC) $(FSK_SRC) $(SIMPLEAUDIO_SRC)
 
 
+test:
+	for file in simpleaudio.[ch] ; \
+	    do  { for rate in 1200 300 50; \
+		do  ./self-test $$rate $$file  || exit; \
+	      	done  }; \
+	    done
+	./self-test rtty self-test-baudot.txt
+	[ ! -f ./run-test ] || ./run-test
+	@echo
+	@echo "minimodem: ALL TESTS PASS"
+	@echo
+
diff --git a/src/Makefile.in b/src/Makefile.in
index 7436e11..4facf9e 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -166,7 +166,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AM_CFLAGS = -Wall -Werror
 INCLUDES = $(DEPS_CFLAGS)
-EXTRA_DIST = self-test # run-test
+EXTRA_DIST = self-test self-test-baudot.txt # run-test
 SIMPLEAUDIO_SRC = \
 	simpleaudio.h		\
 	simpleaudio_internal.h	\
@@ -481,6 +481,18 @@ uninstall-am: uninstall-binPROGRAMS
 	uninstall-am uninstall-binPROGRAMS
 
 
+test:
+	for file in simpleaudio.[ch] ; \
+	    do  { for rate in 1200 300 50; \
+		do  ./self-test $$rate $$file  || exit; \
+	      	done  }; \
+	    done
+	./self-test rtty self-test-baudot.txt
+	[ ! -f ./run-test ] || ./run-test
+	@echo
+	@echo "minimodem: ALL TESTS PASS"
+	@echo
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/self-test b/src/self-test
index 4822a03..ff8c210 100755
--- a/src/self-test
+++ b/src/self-test
@@ -12,6 +12,6 @@ trap "rm -f $TMPF" 0
 
 set -e
 ./minimodem --tx --file $TMPF "$baudmode" < "$textfile"
-ls -l $TMPF
+# ls -l $TMPF
 ./minimodem --rx --file $TMPF "$baudmode" | diff "$textfile" -
 
diff --git a/src/self-test-baudot.txt b/src/self-test-baudot.txt
new file mode 100644
index 0000000..c2741a0
--- /dev/null
+++ b/src/self-test-baudot.txt
@@ -0,0 +1,4 @@
+THIS FILE CONTAINS ONLY CHARACTERS IN THE BAUDOT CHARACTER SET, AND INCLUDES
+SOME CHARACTERS AND NUMBERS FROM THE FIGS TABLE, LIKE 10 AND 20 AND KA6MAL.
+HERE ARE SOME MORE: A1A1A1 2B2B2B TUE JUN 21 14:22:36 PDT 2011.  THE QUICK
+BROWN FOX JUMPS OVER THE LAZY DOG?  YES, HE DOES!