diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index 8da884001..2ff34a5d0 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
@@ -590,8 +590,8 @@ test_extra_programs += {
   'proxy' : {'install' : false},
   'resolver' : {'install' : false},
   'send-data' : {'install' : false},
-  'socket-server' : {'install' : false},
-  'socket-client' : {
+  'socket-testserver' : {'install' : false},
+  'socket-testclient' : {
     'extra_sources' : ['gtlsconsoleinteraction.c'],
     'install' : false,
   },
diff --git a/gio/tests/socket-common.c b/gio/tests/socket-common.c
index 18d083a30..b740f68e7 100644
--- a/gio/tests/socket-common.c
+++ b/gio/tests/socket-common.c
@@ -1,4 +1,4 @@
-/* #included into both socket-client.c and socket-server.c */
+/* #included into both socket-testclient.c and socket-testserver.c */
 
 #ifdef G_OS_UNIX
 static const char *unix_socket_address_types[] = {
diff --git a/gio/tests/socket-client.c b/gio/tests/socket-testclient.c
similarity index 100%
rename from gio/tests/socket-client.c
rename to gio/tests/socket-testclient.c
diff --git a/gio/tests/socket-server.c b/gio/tests/socket-testserver.c
similarity index 100%
rename from gio/tests/socket-server.c
rename to gio/tests/socket-testserver.c