diff --git a/examples/gnrc_tcp_cli/Makefile b/tests/gnrc_tcp_client/Makefile
similarity index 98%
rename from examples/gnrc_tcp_cli/Makefile
rename to tests/gnrc_tcp_client/Makefile
index 06a4cfc01c..03195bc6ec 100644
--- a/examples/gnrc_tcp_cli/Makefile
+++ b/tests/gnrc_tcp_client/Makefile
@@ -1,5 +1,5 @@
 # name of your application
-APPLICATION = gnrc_tcp_cli
+APPLICATION = gnrc_tcp_client
 
 # If no BOARD is found in the environment, use this default:
 BOARD ?= native
diff --git a/examples/gnrc_tcp_cli/main.c b/tests/gnrc_tcp_client/main.c
similarity index 100%
rename from examples/gnrc_tcp_cli/main.c
rename to tests/gnrc_tcp_client/main.c
diff --git a/examples/gnrc_tcp_srv/Makefile b/tests/gnrc_tcp_server/Makefile
similarity index 97%
rename from examples/gnrc_tcp_srv/Makefile
rename to tests/gnrc_tcp_server/Makefile
index 75edf187c0..cd2ee19595 100644
--- a/examples/gnrc_tcp_srv/Makefile
+++ b/tests/gnrc_tcp_server/Makefile
@@ -1,5 +1,5 @@
 # name of your application
-APPLICATION = gnrc_tcp_srv
+APPLICATION = gnrc_tcp_server
 
 # If no BOARD is found in the environment, use this default:
 BOARD ?= native
diff --git a/examples/gnrc_tcp_srv/main.c b/tests/gnrc_tcp_server/main.c
similarity index 100%
rename from examples/gnrc_tcp_srv/main.c
rename to tests/gnrc_tcp_server/main.c