diff --git a/tests/Makefile.am b/tests/Makefile.am
index aed0f13..4ab9773 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,6 +36,7 @@
 clean-local:
 	test ! -f '$(TESTSUITE)' || \
 		$(SHELL) '$(TESTSUITE)' --clean
+	$(RM) -f atconfig
      
 AUTOM4TE = $(SHELL) $(srcdir)/missing --run autom4te
 AUTOTEST = $(AUTOM4TE) --language=autotest
diff --git a/tests/bits/Makefile.am b/tests/bits/Makefile.am
index dd03e83..d6fb2f2 100644
--- a/tests/bits/Makefile.am
+++ b/tests/bits/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = bitrev_test
+EXTRA_DIST = bitrev_test.ok
 
 bitrev_test_SOURCES = bitrev_test.c
 bitrev_test_LDADD = $(top_builddir)/src/libosmocore.la
diff --git a/tests/msgfile/Makefile.am b/tests/msgfile/Makefile.am
index c9f4bec..88c355d 100644
--- a/tests/msgfile/Makefile.am
+++ b/tests/msgfile/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = msgfile_test
+EXTRA_DIST = msgfile_test.ok msgconfig.cfg
 
 msgfile_test_SOURCES = msgfile_test.c
 msgfile_test_LDADD = $(top_builddir)/src/libosmocore.la
diff --git a/tests/osmo-test.in b/tests/osmo-test.in
deleted file mode 100644
index c2dc912..0000000
--- a/tests/osmo-test.in
+++ /dev/null
@@ -1,2 +0,0 @@
-abs_top_builddir=@abs_top_builddir@
-: ${LIBTOOL=$abs_top_builddir/libtool
diff --git a/tests/sms/Makefile.am b/tests/sms/Makefile.am
index fa4e387..02860af 100644
--- a/tests/sms/Makefile.am
+++ b/tests/sms/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = sms_test
+EXTRA_DIST = sms_test.ok
 
 sms_test_SOURCES = sms_test.c
 sms_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
diff --git a/tests/smscb/Makefile.am b/tests/smscb/Makefile.am
index 9a6fb4f..7045ea7 100644
--- a/tests/smscb/Makefile.am
+++ b/tests/smscb/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = smscb_test
+EXTRA_DIST = smscb_test.ok
 
 smscb_test_SOURCES = smscb_test.c
 smscb_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la
diff --git a/tests/testsuite.at b/tests/testsuite.at
index b33b04a..88c3dcb 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,6 +1,4 @@
 AT_INIT
-AT_TESTED(osmo-test)
-
 AT_BANNER([Regression tests.])
 
 
diff --git a/tests/timer/Makefile.am b/tests/timer/Makefile.am
index d3decf5..062d81b 100644
--- a/tests/timer/Makefile.am
+++ b/tests/timer/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = timer_test
+EXTRA_DIST = timer_test.ok
 
 timer_test_SOURCES = timer_test.c
 timer_test_LDADD = $(top_builddir)/src/libosmocore.la
diff --git a/tests/ussd/Makefile.am b/tests/ussd/Makefile.am
index ef9aa49..de9ff89 100644
--- a/tests/ussd/Makefile.am
+++ b/tests/ussd/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = $(all_includes) -I$(top_srcdir)/include
 noinst_PROGRAMS = ussd_test
+EXTRA_DIST = ussd_test.ok
 
 ussd_test_SOURCES = ussd_test.c
 ussd_test_LDADD = $(top_builddir)/src/libosmocore.la $(top_builddir)/src/gsm/libosmogsm.la