diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8df9d56..5f4914e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -51,9 +51,9 @@
 		 smscb/gsm0341_test                                     \
 		 smscb/cbsp_test                                        \
 		 auth/xor2g_test                                        \
-		 v110/test_frame                                        \
-		 v110/test_ra1                                          \
-		 gsm44021/test_frame_csd                                \
+		 v110/frame_test                                        \
+		 v110/ra1_test                                          \
+		 gsm44021/frame_csd_test                                \
 		 osmo_io/osmo_io_test					\
 		 $(NULL)
 
@@ -362,14 +362,14 @@
 iuup_iuup_test_SOURCES = iuup/iuup_test.c
 iuup_iuup_test_LDADD = $(top_builddir)/src/gsm/libosmogsm.la $(LDADD)
 
-v110_test_frame_SOURCES = v110/test_frame.c
-v110_test_frame_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
+v110_frame_test_SOURCES = v110/frame_test.c
+v110_frame_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
 
-v110_test_ra1_SOURCES = v110/test_ra1.c
-v110_test_ra1_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
+v110_ra1_test_SOURCES = v110/ra1_test.c
+v110_ra1_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la $(LDADD)
 
-gsm44021_test_frame_csd_SOURCES = gsm44021/test_frame_csd.c
-gsm44021_test_frame_csd_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \
+gsm44021_frame_csd_test_SOURCES = gsm44021/frame_csd_test.c
+gsm44021_frame_csd_test_LDADD = $(top_builddir)/src/isdn/libosmoisdn.la \
 				$(top_builddir)/src/gsm/libosmogsm.la \
 				$(LDADD)
 
@@ -475,9 +475,9 @@
 	     smscb/smscb_test.ok \
 	     smscb/gsm0341_test.ok \
 	     smscb/cbsp_test.ok \
-	     v110/test_frame.ok \
-	     v110/test_ra1.ok \
-	     gsm44021/test_frame_csd.ok \
+	     v110/frame_test.ok \
+	     v110/ra1_test.ok \
+	     gsm44021/frame_csd_test.ok \
 	     osmo_io/osmo_io_test.ok osmo_io/osmo_io_test.err \
 	     $(NULL)
 
@@ -684,12 +684,12 @@
 		>$(srcdir)/time_cc/time_cc_test.ok
 	iuup/iuup_test \
 		>$(srcdir)/iuup/iuup_test.ok
-	v110/test_frame \
-		>$(srcdir)/v110/test_frame.ok
-	v110/test_ra1 \
-		>$(srcdir)/v110/test_ra1.ok
-	gsm44021/test_frame_csd \
-		>$(srcdir)/gsm44021/test_frame_csd.ok
+	v110/frame_test \
+		>$(srcdir)/v110/frame_test.ok
+	v110/ra1_test \
+		>$(srcdir)/v110/ra1_test.ok
+	gsm44021/frame_csd_test \
+		>$(srcdir)/gsm44021/frame_csd_test.ok
 	osmo_io/osmo_io_test \
 		>$(srcdir)/osmo_io/osmo_io_test.ok \
 		2>$(srcdir)/osmo_io/osmo_io_test.err
diff --git a/tests/gsm44021/test_frame_csd.c b/tests/gsm44021/frame_csd_test.c
similarity index 100%
rename from tests/gsm44021/test_frame_csd.c
rename to tests/gsm44021/frame_csd_test.c
diff --git a/tests/gsm44021/test_frame_csd.ok b/tests/gsm44021/frame_csd_test.ok
similarity index 100%
rename from tests/gsm44021/test_frame_csd.ok
rename to tests/gsm44021/frame_csd_test.ok
diff --git a/tests/testsuite.at b/tests/testsuite.at
index a2c8845..3366995 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -491,22 +491,22 @@
 AT_CHECK([$abs_top_builddir/tests/iuup/iuup_test], [0], [expout], [ignore])
 AT_CLEANUP
 
-AT_SETUP([v110_test_frame])
-AT_KEYWORDS([v110_test_frame])
-cat $abs_srcdir/v110/test_frame.ok > expout
-AT_CHECK([$abs_top_builddir/tests/v110/test_frame], [], [expout],[])
+AT_SETUP([v110_frame_test])
+AT_KEYWORDS([v110_frame_test])
+cat $abs_srcdir/v110/frame_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/v110/frame_test], [], [expout],[])
 AT_CLEANUP
 
-AT_SETUP([v110_test_ra1])
-AT_KEYWORDS([v110_test_ra1])
-cat $abs_srcdir/v110/test_ra1.ok > expout
-AT_CHECK([$abs_top_builddir/tests/v110/test_ra1], [], [expout],[])
+AT_SETUP([v110_ra1_test])
+AT_KEYWORDS([v110_ra1_test])
+cat $abs_srcdir/v110/ra1_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/v110/ra1_test], [], [expout],[])
 AT_CLEANUP
 
-AT_SETUP([gsm44021_test_frame_csd])
-AT_KEYWORDS([gsm44021_test_frame_csd])
-cat $abs_srcdir/gsm44021/test_frame_csd.ok > expout
-AT_CHECK([$abs_top_builddir/tests/gsm44021/test_frame_csd], [], [expout],[])
+AT_SETUP([gsm44021_frame_csd_test])
+AT_KEYWORDS([gsm44021_frame_csd_test])
+cat $abs_srcdir/gsm44021/frame_csd_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/gsm44021/frame_csd_test], [], [expout],[])
 AT_CLEANUP
 
 AT_SETUP([osmo_io])
diff --git a/tests/v110/test_frame.c b/tests/v110/frame_test.c
similarity index 100%
rename from tests/v110/test_frame.c
rename to tests/v110/frame_test.c
diff --git a/tests/v110/test_frame.ok b/tests/v110/frame_test.ok
similarity index 100%
rename from tests/v110/test_frame.ok
rename to tests/v110/frame_test.ok
diff --git a/tests/v110/test_ra1.c b/tests/v110/ra1_test.c
similarity index 100%
rename from tests/v110/test_ra1.c
rename to tests/v110/ra1_test.c
diff --git a/tests/v110/test_ra1.ok b/tests/v110/ra1_test.ok
similarity index 100%
rename from tests/v110/test_ra1.ok
rename to tests/v110/ra1_test.ok