diff --git a/openbsc/tests/oap/Makefile.am b/openbsc/tests/oap/Makefile.am
index c17abb5..df0a43f 100644
--- a/openbsc/tests/oap/Makefile.am
+++ b/openbsc/tests/oap/Makefile.am
@@ -11,22 +11,22 @@
 	$(NULL)
 
 EXTRA_DIST = \
-	oap_test.ok \
+	oap_client_test.ok \
 	$(NULL)
 
 if HAVE_LIBGTP
 if HAVE_LIBCARES
 noinst_PROGRAMS = \
-	oap_test \
+	oap_client_test \
 	$(NULL)
 endif
 endif
 
-oap_test_SOURCES = \
-	oap_test.c \
+oap_client_test_SOURCES = \
+	oap_client_test.c \
 	$(NULL)
 
-oap_test_LDADD = \
+oap_client_test_LDADD = \
 	$(top_builddir)/src/gprs/gprs_utils.o \
 	$(top_builddir)/src/libcommon/libcommon.a \
 	$(LIBOSMOCORE_LIBS) \
diff --git a/openbsc/tests/oap/oap_test.c b/openbsc/tests/oap/oap_client_test.c
similarity index 100%
rename from openbsc/tests/oap/oap_test.c
rename to openbsc/tests/oap/oap_client_test.c
diff --git a/openbsc/tests/oap/oap_test.ok b/openbsc/tests/oap/oap_client_test.ok
similarity index 100%
rename from openbsc/tests/oap/oap_test.ok
rename to openbsc/tests/oap/oap_client_test.ok
diff --git a/openbsc/tests/testsuite.at b/openbsc/tests/testsuite.at
index b44d595..0765c76 100644
--- a/openbsc/tests/testsuite.at
+++ b/openbsc/tests/testsuite.at
@@ -107,8 +107,8 @@
 AT_SETUP([oap])
 AT_KEYWORDS([oap])
 AT_CHECK([test "$enable_oap_test" != no || exit 77])
-cat $abs_srcdir/oap/oap_test.ok > expout
-AT_CHECK([$abs_top_builddir/tests/oap/oap_test], [], [expout], [ignore])
+cat $abs_srcdir/oap/oap_client_test.ok > expout
+AT_CHECK([$abs_top_builddir/tests/oap/oap_client_test], [], [expout], [ignore])
 AT_CLEANUP
 
 AT_SETUP([gtphub])