diff --git a/tests/Makefile.am b/tests/Makefile.am
index 45490f2dc..3b4325ee3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -15,7 +15,7 @@ check_PROGRAMS = timer/timer_test sms/sms_test ussd/ussd_test		\
                  gsm0808/gsm0808_test gsm0408/gsm0408_test		\
 		 gprs/gprs_test	kasumi/kasumi_test gea/gea_test		\
 		 logging/logging_test codec/codec_test			\
-		 logging/logging_test_gsmtap				\
+		 logging/logging_gsmtap_test				\
 		 loggingrb/loggingrb_test strrb/strrb_test              \
 		 comp128/comp128_test                         		\
 		 bitvec/bitvec_test msgb/msgb_test bits/bitcomp_test	\
@@ -246,7 +246,7 @@ logging_logging_test_SOURCES = logging/logging_test.c
 logging_logging_vty_test_SOURCES = logging/logging_vty_test.c
 logging_logging_vty_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
 
-logging_logging_test_gsmtap_SOURCES = logging/logging_test_gsmtap.c
+logging_logging_gsmtap_test_SOURCES = logging/logging_gsmtap_test.c
 
 vty_vty_transcript_test_SOURCES = vty/vty_transcript_test.c
 vty_vty_transcript_test_LDADD = $(top_builddir)/src/vty/libosmovty.la $(LDADD)
@@ -431,7 +431,7 @@ EXTRA_DIST = testsuite.at $(srcdir)/package.m4 $(TESTSUITE)		\
              msgfile/msgfile_test.ok msgfile/msgconfig.cfg		\
              logging/logging_test.ok logging/logging_test.err		\
              logging/logging_vty_test.vty				\
-	     logging/logging_test_gsmtap.err				\
+	     logging/logging_gsmtap_test.err				\
              fr/fr_test.ok loggingrb/logging_test.ok			\
              loggingrb/logging_test.err	strrb/strrb_test.ok		\
              codec/codec_test.ok \
@@ -589,8 +589,8 @@ endif
 	logging/logging_test \
 		>$(srcdir)/logging/logging_test.ok \
 		2>$(srcdir)/logging/logging_test.err
-	logging/logging_test_gsmtap \
-		2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_test_gsmtap.err
+	logging/logging_gsmtap_test \
+		2>&1 |grep -v "enqueueing message failed" >$(srcdir)/logging/logging_gsmtap_test.err
 	codec/codec_test \
 		>$(srcdir)/codec/codec_test.ok
 	codec/codec_ecu_fr_test \
diff --git a/tests/logging/logging_test_gsmtap.c b/tests/logging/logging_gsmtap_test.c
similarity index 100%
rename from tests/logging/logging_test_gsmtap.c
rename to tests/logging/logging_gsmtap_test.c
diff --git a/tests/logging/logging_test_gsmtap.err b/tests/logging/logging_gsmtap_test.err
similarity index 100%
rename from tests/logging/logging_test_gsmtap.err
rename to tests/logging/logging_gsmtap_test.err
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 9f17ba343..e721b937c 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -202,8 +202,8 @@ AT_CLEANUP
 
 AT_SETUP([logging_gsmtap])
 AT_KEYWORDS([logging_gsmtap])
-cat $abs_srcdir/logging/logging_test_gsmtap.err > experr
-AT_CHECK([$abs_top_builddir/tests/logging/logging_test_gsmtap 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr])
+cat $abs_srcdir/logging/logging_gsmtap_test.err > experr
+AT_CHECK([$abs_top_builddir/tests/logging/logging_gsmtap_test 3>&1 1>&2 2>&3 |grep -v "enqueueing message failed" 3>&1 1>&2 2>&3 ], [], [ignore], [experr])
 AT_CLEANUP
 
 AT_SETUP([codec])