diff --git a/tests/lwip/Makefile b/tests/pkg/lwip/Makefile
similarity index 96%
rename from tests/lwip/Makefile
rename to tests/pkg/lwip/Makefile
index 24de0e8c92..15cb30e1c0 100644
--- a/tests/lwip/Makefile
+++ b/tests/pkg/lwip/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 LWIP_IPV4 ?= 0
 LWIP_IPV6 ?= 1
diff --git a/tests/lwip/Makefile.ci b/tests/pkg/lwip/Makefile.ci
similarity index 100%
rename from tests/lwip/Makefile.ci
rename to tests/pkg/lwip/Makefile.ci
diff --git a/tests/lwip/common.c b/tests/pkg/lwip/common.c
similarity index 100%
rename from tests/lwip/common.c
rename to tests/pkg/lwip/common.c
diff --git a/tests/lwip/common.h b/tests/pkg/lwip/common.h
similarity index 100%
rename from tests/lwip/common.h
rename to tests/pkg/lwip/common.h
diff --git a/tests/lwip/ip.c b/tests/pkg/lwip/ip.c
similarity index 100%
rename from tests/lwip/ip.c
rename to tests/pkg/lwip/ip.c
diff --git a/tests/lwip/main.c b/tests/pkg/lwip/main.c
similarity index 100%
rename from tests/lwip/main.c
rename to tests/pkg/lwip/main.c
diff --git a/tests/lwip/tcp.c b/tests/pkg/lwip/tcp.c
similarity index 100%
rename from tests/lwip/tcp.c
rename to tests/pkg/lwip/tcp.c
diff --git a/tests/lwip/tests/01-run.py b/tests/pkg/lwip/tests/01-run.py
similarity index 100%
rename from tests/lwip/tests/01-run.py
rename to tests/pkg/lwip/tests/01-run.py
diff --git a/tests/lwip/udp.c b/tests/pkg/lwip/udp.c
similarity index 100%
rename from tests/lwip/udp.c
rename to tests/pkg/lwip/udp.c
diff --git a/tests/lwip_sock_ip/Makefile b/tests/pkg/lwip_sock_ip/Makefile
similarity index 95%
rename from tests/lwip_sock_ip/Makefile
rename to tests/pkg/lwip_sock_ip/Makefile
index 2dc9551cd1..7c3ca41fd2 100644
--- a/tests/lwip_sock_ip/Makefile
+++ b/tests/pkg/lwip_sock_ip/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 LWIP_IPV4 ?= 0
 LWIP_IPV6 ?= 1
diff --git a/tests/lwip_sock_ip/Makefile.ci b/tests/pkg/lwip_sock_ip/Makefile.ci
similarity index 100%
rename from tests/lwip_sock_ip/Makefile.ci
rename to tests/pkg/lwip_sock_ip/Makefile.ci
diff --git a/tests/lwip_sock_ip/README.md b/tests/pkg/lwip_sock_ip/README.md
similarity index 100%
rename from tests/lwip_sock_ip/README.md
rename to tests/pkg/lwip_sock_ip/README.md
diff --git a/tests/lwip_sock_ip/constants.h b/tests/pkg/lwip_sock_ip/constants.h
similarity index 100%
rename from tests/lwip_sock_ip/constants.h
rename to tests/pkg/lwip_sock_ip/constants.h
diff --git a/tests/lwip_sock_ip/main.c b/tests/pkg/lwip_sock_ip/main.c
similarity index 100%
rename from tests/lwip_sock_ip/main.c
rename to tests/pkg/lwip_sock_ip/main.c
diff --git a/tests/lwip_sock_ip/stack.c b/tests/pkg/lwip_sock_ip/stack.c
similarity index 100%
rename from tests/lwip_sock_ip/stack.c
rename to tests/pkg/lwip_sock_ip/stack.c
diff --git a/tests/lwip_sock_ip/stack.h b/tests/pkg/lwip_sock_ip/stack.h
similarity index 100%
rename from tests/lwip_sock_ip/stack.h
rename to tests/pkg/lwip_sock_ip/stack.h
diff --git a/tests/lwip_sock_ip/tests/01-run.py b/tests/pkg/lwip_sock_ip/tests/01-run.py
similarity index 100%
rename from tests/lwip_sock_ip/tests/01-run.py
rename to tests/pkg/lwip_sock_ip/tests/01-run.py
diff --git a/tests/lwip_sock_tcp/Makefile b/tests/pkg/lwip_sock_tcp/Makefile
similarity index 95%
rename from tests/lwip_sock_tcp/Makefile
rename to tests/pkg/lwip_sock_tcp/Makefile
index c5dd423df7..0454f9cc76 100644
--- a/tests/lwip_sock_tcp/Makefile
+++ b/tests/pkg/lwip_sock_tcp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 LWIP_IPV4 ?= 0
 LWIP_IPV6 ?= 1
diff --git a/tests/lwip_sock_tcp/Makefile.ci b/tests/pkg/lwip_sock_tcp/Makefile.ci
similarity index 100%
rename from tests/lwip_sock_tcp/Makefile.ci
rename to tests/pkg/lwip_sock_tcp/Makefile.ci
diff --git a/tests/lwip_sock_tcp/README.md b/tests/pkg/lwip_sock_tcp/README.md
similarity index 100%
rename from tests/lwip_sock_tcp/README.md
rename to tests/pkg/lwip_sock_tcp/README.md
diff --git a/tests/lwip_sock_tcp/constants.h b/tests/pkg/lwip_sock_tcp/constants.h
similarity index 100%
rename from tests/lwip_sock_tcp/constants.h
rename to tests/pkg/lwip_sock_tcp/constants.h
diff --git a/tests/lwip_sock_tcp/main.c b/tests/pkg/lwip_sock_tcp/main.c
similarity index 100%
rename from tests/lwip_sock_tcp/main.c
rename to tests/pkg/lwip_sock_tcp/main.c
diff --git a/tests/lwip_sock_tcp/stack.c b/tests/pkg/lwip_sock_tcp/stack.c
similarity index 100%
rename from tests/lwip_sock_tcp/stack.c
rename to tests/pkg/lwip_sock_tcp/stack.c
diff --git a/tests/lwip_sock_tcp/stack.h b/tests/pkg/lwip_sock_tcp/stack.h
similarity index 100%
rename from tests/lwip_sock_tcp/stack.h
rename to tests/pkg/lwip_sock_tcp/stack.h
diff --git a/tests/lwip_sock_tcp/tests/01-run.py b/tests/pkg/lwip_sock_tcp/tests/01-run.py
similarity index 100%
rename from tests/lwip_sock_tcp/tests/01-run.py
rename to tests/pkg/lwip_sock_tcp/tests/01-run.py
diff --git a/tests/lwip_sock_udp/Makefile b/tests/pkg/lwip_sock_udp/Makefile
similarity index 95%
rename from tests/lwip_sock_udp/Makefile
rename to tests/pkg/lwip_sock_udp/Makefile
index 94cf7bd1f8..0712df9d69 100644
--- a/tests/lwip_sock_udp/Makefile
+++ b/tests/pkg/lwip_sock_udp/Makefile
@@ -1,4 +1,4 @@
-include ../Makefile.tests_common
+include ../Makefile.pkg_common
 
 LWIP_IPV4 ?= 0
 LWIP_IPV6 ?= 1
diff --git a/tests/lwip_sock_udp/Makefile.ci b/tests/pkg/lwip_sock_udp/Makefile.ci
similarity index 100%
rename from tests/lwip_sock_udp/Makefile.ci
rename to tests/pkg/lwip_sock_udp/Makefile.ci
diff --git a/tests/lwip_sock_udp/README.md b/tests/pkg/lwip_sock_udp/README.md
similarity index 100%
rename from tests/lwip_sock_udp/README.md
rename to tests/pkg/lwip_sock_udp/README.md
diff --git a/tests/lwip_sock_udp/constants.h b/tests/pkg/lwip_sock_udp/constants.h
similarity index 100%
rename from tests/lwip_sock_udp/constants.h
rename to tests/pkg/lwip_sock_udp/constants.h
diff --git a/tests/lwip_sock_udp/main.c b/tests/pkg/lwip_sock_udp/main.c
similarity index 100%
rename from tests/lwip_sock_udp/main.c
rename to tests/pkg/lwip_sock_udp/main.c
diff --git a/tests/lwip_sock_udp/stack.c b/tests/pkg/lwip_sock_udp/stack.c
similarity index 100%
rename from tests/lwip_sock_udp/stack.c
rename to tests/pkg/lwip_sock_udp/stack.c
diff --git a/tests/lwip_sock_udp/stack.h b/tests/pkg/lwip_sock_udp/stack.h
similarity index 100%
rename from tests/lwip_sock_udp/stack.h
rename to tests/pkg/lwip_sock_udp/stack.h
diff --git a/tests/lwip_sock_udp/tests/01-run.py b/tests/pkg/lwip_sock_udp/tests/01-run.py
similarity index 100%
rename from tests/lwip_sock_udp/tests/01-run.py
rename to tests/pkg/lwip_sock_udp/tests/01-run.py