diff --git a/configure b/configure
index c0c238c..233fa24 100755
--- a/configure
+++ b/configure
@@ -589,6 +589,7 @@ ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+auto_find_tests
 DEPS_LIBS
 DEPS_CFLAGS
 PKG_CONFIG_LIBDIR
@@ -3722,6 +3723,9 @@ fi
 
 
 
+auto_find_tests='$(sort $(wildcard *.test))'
+
+
 # Checks for header files.
 # AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
 
diff --git a/configure.ac b/configure.ac
index a3ec20a..107522e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,8 @@ PKG_CHECK_MODULES(DEPS, [ $deps_packages ])
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
+AC_SUBST([auto_find_tests], ['$(sort $(wildcard *.test))'])
+
 # Checks for header files.
 # AC_CHECK_HEADERS([stdlib.h string.h unistd.h])
 
diff --git a/tests/test-01-self-test-1200 b/tests/01-self-test-1200.test
similarity index 100%
rename from tests/test-01-self-test-1200
rename to tests/01-self-test-1200.test
diff --git a/tests/test-02-self-test-300 b/tests/02-self-test-300.test
similarity index 100%
rename from tests/test-02-self-test-300
rename to tests/02-self-test-300.test
diff --git a/tests/test-03-self-test-rtty b/tests/03-self-test-rtty.test
similarity index 100%
rename from tests/test-03-self-test-rtty
rename to tests/03-self-test-rtty.test
diff --git a/tests/test-04-self-test-0.5 b/tests/04-self-test-0.5.test
similarity index 100%
rename from tests/test-04-self-test-0.5
rename to tests/04-self-test-0.5.test
diff --git a/tests/test-05-self-test-12000 b/tests/05-self-test-12000.test
similarity index 100%
rename from tests/test-05-self-test-12000
rename to tests/05-self-test-12000.test
diff --git a/tests/test-06-self-test-float-samples b/tests/06-self-test-float-samples.test
similarity index 100%
rename from tests/test-06-self-test-float-samples
rename to tests/06-self-test-float-samples.test
diff --git a/tests/test-07-self-test-no-lut b/tests/07-self-test-no-lut.test
similarity index 100%
rename from tests/test-07-self-test-no-lut
rename to tests/07-self-test-no-lut.test
diff --git a/tests/test-08-self-test-lut16 b/tests/08-self-test-lut16.test
similarity index 100%
rename from tests/test-08-self-test-lut16
rename to tests/08-self-test-lut16.test
diff --git a/tests/test-09-self-test-lut16-float b/tests/09-self-test-lut16-float.test
similarity index 100%
rename from tests/test-09-self-test-lut16-float
rename to tests/09-self-test-lut16-float.test
diff --git a/tests/test-10-verify-perfect b/tests/10-verify-perfect.test
similarity index 100%
rename from tests/test-10-verify-perfect
rename to tests/10-verify-perfect.test
diff --git a/tests/test-11-verify-perfect-nolut b/tests/11-verify-perfect-nolut.test
similarity index 100%
rename from tests/test-11-verify-perfect-nolut
rename to tests/11-verify-perfect-nolut.test
diff --git a/tests/test-12-verify-perfect-lut16 b/tests/12-verify-perfect-lut16.test
similarity index 100%
rename from tests/test-12-verify-perfect-lut16
rename to tests/12-verify-perfect-lut16.test
diff --git a/tests/test-13-verify-perfect-nolut-float b/tests/13-verify-perfect-nolut-float.test
similarity index 100%
rename from tests/test-13-verify-perfect-nolut-float
rename to tests/13-verify-perfect-nolut-float.test
diff --git a/tests/test-14-verify-perfect-lut16-float b/tests/14-verify-perfect-lut16-float.test
similarity index 100%
rename from tests/test-14-verify-perfect-lut16-float
rename to tests/14-verify-perfect-lut16-float.test
diff --git a/tests/test-15-verify-perfect-float b/tests/15-verify-perfect-float.test
similarity index 100%
rename from tests/test-15-verify-perfect-float
rename to tests/15-verify-perfect-float.test
diff --git a/tests/test-21-rate-slop b/tests/21-rate-slop.test
similarity index 100%
rename from tests/test-21-rate-slop
rename to tests/21-rate-slop.test
diff --git a/tests/test-30-amplitude b/tests/30-amplitude.test
similarity index 100%
rename from tests/test-30-amplitude
rename to tests/30-amplitude.test
diff --git a/tests/31-amplitude-float.test b/tests/31-amplitude-float.test
new file mode 100755
index 0000000..2099427
--- /dev/null
+++ b/tests/31-amplitude-float.test
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ./30-amplitude.test --float
diff --git a/tests/test-40-noise b/tests/40-noise.test
similarity index 100%
rename from tests/test-40-noise
rename to tests/40-noise.test
diff --git a/tests/41-noise-purefreqs.test b/tests/41-noise-purefreqs.test
new file mode 100755
index 0000000..eb054b8
--- /dev/null
+++ b/tests/41-noise-purefreqs.test
@@ -0,0 +1 @@
+exec ./40-noise.test 1200 -M 1200 -S 2400
diff --git a/tests/test-60-multibyte b/tests/60-multibyte.test
similarity index 100%
rename from tests/test-60-multibyte
rename to tests/60-multibyte.test
diff --git a/tests/test-70-callerid-mdmf b/tests/70-callerid-mdmf.test
similarity index 100%
rename from tests/test-70-callerid-mdmf
rename to tests/70-callerid-mdmf.test
diff --git a/tests/71-callerid-sdmf.test b/tests/71-callerid-sdmf.test
new file mode 100755
index 0000000..00f8109
--- /dev/null
+++ b/tests/71-callerid-sdmf.test
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec ./70-callerid-mdmf.test testdata-callerid-sdmf.bytes
diff --git a/tests/test-80-SAME b/tests/80-SAME.test
similarity index 100%
rename from tests/test-80-SAME
rename to tests/80-SAME.test
diff --git a/tests/test-81-ascii7 b/tests/81-ascii7.test
similarity index 100%
rename from tests/test-81-ascii7
rename to tests/81-ascii7.test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f3f4f5b..21cf759 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,8 +20,8 @@
 EXTRA_DIST = \
 	run-self-tests \
 	self-test \
-	test-* \
+	*.test \
 	testdata-*
 
-TESTS = test-*
+TESTS = @auto_find_tests@
 
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1d1a44a..6b6d4cd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -178,10 +178,10 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	run-self-tests \
 	self-test \
-	test-* \
+	*.test \
 	testdata-*
 
-TESTS = test-*
+TESTS = @auto_find_tests@
 all: all-am
 
 .SUFFIXES:
diff --git a/tests/run-self-tests b/tests/run-self-tests
index 36205fb..04d2f30 100755
--- a/tests/run-self-tests
+++ b/tests/run-self-tests
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-for testcase in ./test-*
+for testcase in ./*.test
 do
    $testcase
    if [ $? -eq 0 ]
diff --git a/tests/test-31-amplitude-float b/tests/test-31-amplitude-float
deleted file mode 100755
index 960c55d..0000000
--- a/tests/test-31-amplitude-float
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec ./test-30-amplitude --float
diff --git a/tests/test-41-noise-purefreqs b/tests/test-41-noise-purefreqs
deleted file mode 100755
index afc86e7..0000000
--- a/tests/test-41-noise-purefreqs
+++ /dev/null
@@ -1 +0,0 @@
-exec ./test-40-noise 1200 -M 1200 -S 2400
diff --git a/tests/test-71-callerid-sdmf b/tests/test-71-callerid-sdmf
deleted file mode 100755
index 4798466..0000000
--- a/tests/test-71-callerid-sdmf
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-exec ./test-70-callerid-mdmf testdata-callerid-sdmf.bytes