diff --git a/tests/net/6lo/Makefile b/tests/net/6lo/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/6lo/Makefile
+++ b/tests/net/6lo/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/6lo/prj.mdef b/tests/net/6lo/prj.mdef
deleted file mode 100644
index 648f29b5c4e..00000000000
--- a/tests/net/6lo/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/arp/Makefile b/tests/net/arp/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/arp/Makefile
+++ b/tests/net/arp/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/arp/prj.mdef b/tests/net/arp/prj.mdef
deleted file mode 100644
index 648f29b5c4e..00000000000
--- a/tests/net/arp/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/context/Makefile b/tests/net/context/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/context/Makefile
+++ b/tests/net/context/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/context/prj.mdef b/tests/net/context/prj.mdef
deleted file mode 100644
index 87c5b59d67e..00000000000
--- a/tests/net/context/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Buffer test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/dhcpv4/Makefile b/tests/net/dhcpv4/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/dhcpv4/Makefile
+++ b/tests/net/dhcpv4/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/dhcpv4/prj.mdef b/tests/net/dhcpv4/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/dhcpv4/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/dhcpv4/src/main.c b/tests/net/dhcpv4/src/main.c
index 11ebac8f210..3f8b8633b2c 100644
--- a/tests/net/dhcpv4/src/main.c
+++ b/tests/net/dhcpv4/src/main.c
@@ -554,18 +554,11 @@ void main_fiber(void)
 	fiber_yield();
 }
 
-#if defined(CONFIG_NANOKERNEL)
 #define STACKSIZE 3000
 char __noinit __stack fiberStack[STACKSIZE];
-#endif
 
 void main(void)
 {
-#if defined(CONFIG_MICROKERNEL)
-	main_fiber();
-#else
 	task_fiber_start(&fiberStack[0], STACKSIZE,
 				(nano_fiber_entry_t)main_fiber, 0, 0, 7, 0);
-#endif
-	net_mgmt_del_event_callback(&rx_cb);
 }
diff --git a/tests/net/dhcpv4/testcase.ini b/tests/net/dhcpv4/testcase.ini
index e8935e7acf4..c986f717cb2 100644
--- a/tests/net/dhcpv4/testcase.ini
+++ b/tests/net/dhcpv4/testcase.ini
@@ -1,10 +1,3 @@
-[test_micro]
+[test]
 tags = net-dhcvp4
 arch_whitelist = x86
-kernel = micro
-
-[test_nano]
-tags = net-dhcpv4
-arch_whitelist = x86
-kernel = nano
-platform_exclude = quark_d2000_crb # not enough RAM
diff --git a/tests/net/icmpv6/Makefile b/tests/net/icmpv6/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/icmpv6/Makefile
+++ b/tests/net/icmpv6/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/icmpv6/prj.mdef b/tests/net/icmpv6/prj.mdef
deleted file mode 100644
index 967f3e15bf6..00000000000
--- a/tests/net/icmpv6/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : ICMPv6 test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/ieee802154/fragment/Makefile b/tests/net/ieee802154/fragment/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/ieee802154/fragment/Makefile
+++ b/tests/net/ieee802154/fragment/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ieee802154/fragment/prj.mdef b/tests/net/ieee802154/fragment/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/ieee802154/fragment/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/ieee802154/l2/Makefile b/tests/net/ieee802154/l2/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/ieee802154/l2/Makefile
+++ b/tests/net/ieee802154/l2/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ieee802154/l2/prj.mdef b/tests/net/ieee802154/l2/prj.mdef
deleted file mode 100644
index 648f29b5c4e..00000000000
--- a/tests/net/ieee802154/l2/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/ip-addr/Makefile b/tests/net/ip-addr/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/ip-addr/Makefile
+++ b/tests/net/ip-addr/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ip-addr/prj.mdef b/tests/net/ip-addr/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/ip-addr/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/ipv6/Makefile b/tests/net/ipv6/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/ipv6/Makefile
+++ b/tests/net/ipv6/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ipv6/prj.mdef b/tests/net/ipv6/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/ipv6/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/mgmt/Makefile b/tests/net/mgmt/Makefile
index 13b76148d74..5647baa56ec 100644
--- a/tests/net/mgmt/Makefile
+++ b/tests/net/mgmt/Makefile
@@ -1,5 +1,4 @@
 BOARD ?= qemu_x86
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/nbuf/Makefile b/tests/net/nbuf/Makefile
index de33f156022..7df371c9817 100644
--- a/tests/net/nbuf/Makefile
+++ b/tests/net/nbuf/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE ?= prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/nbuf/prj.mdef b/tests/net/nbuf/prj.mdef
deleted file mode 100644
index 5aaf534cb0a..00000000000
--- a/tests/net/nbuf/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Buffer test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/nbuf/src/main.c b/tests/net/nbuf/src/main.c
index 0ab3cfa8727..3d461083d9b 100644
--- a/tests/net/nbuf/src/main.c
+++ b/tests/net/nbuf/src/main.c
@@ -1171,11 +1171,8 @@ static int test_nbuf_read_write_insert(void)
 	return 0;
 }
 
-#ifdef CONFIG_MICROKERNEL
-void mainloop(void)
-#else
+
 void main(void)
-#endif
 {
 	if (test_ipv6_multi_frags() < 0) {
 		goto fail;
diff --git a/tests/net/neighbor/Makefile b/tests/net/neighbor/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/neighbor/Makefile
+++ b/tests/net/neighbor/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/neighbor/prj.mdef b/tests/net/neighbor/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/neighbor/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/route/Makefile b/tests/net/route/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/route/Makefile
+++ b/tests/net/route/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/route/prj.mdef b/tests/net/route/prj.mdef
deleted file mode 100644
index 87c5b59d67e..00000000000
--- a/tests/net/route/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Buffer test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/rpl/Makefile b/tests/net/rpl/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/rpl/Makefile
+++ b/tests/net/rpl/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/rpl/prj.mdef b/tests/net/rpl/prj.mdef
deleted file mode 100644
index 87c5b59d67e..00000000000
--- a/tests/net/rpl/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Buffer test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/tcp/Makefile b/tests/net/tcp/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/tcp/Makefile
+++ b/tests/net/tcp/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/tcp/prj.mdef b/tests/net/tcp/prj.mdef
deleted file mode 100644
index 648f29b5c4e..00000000000
--- a/tests/net/tcp/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/trickle/Makefile b/tests/net/trickle/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/trickle/Makefile
+++ b/tests/net/trickle/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/trickle/prj.mdef b/tests/net/trickle/prj.mdef
deleted file mode 100644
index 791a012181e..00000000000
--- a/tests/net/trickle/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Unit test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/udp/Makefile b/tests/net/udp/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/udp/Makefile
+++ b/tests/net/udp/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/udp/prj.mdef b/tests/net/udp/prj.mdef
deleted file mode 100644
index 648f29b5c4e..00000000000
--- a/tests/net/udp/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]
diff --git a/tests/net/utils/Makefile b/tests/net/utils/Makefile
index b80ea39a8e5..5647baa56ec 100644
--- a/tests/net/utils/Makefile
+++ b/tests/net/utils/Makefile
@@ -1,6 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
-KERNEL_TYPE ?= nano
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/utils/prj.mdef b/tests/net/utils/prj.mdef
deleted file mode 100644
index 79a413f1797..00000000000
--- a/tests/net/utils/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Network test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 mainloop        2048 [EXE]
diff --git a/tests/net/zoap/Makefile b/tests/net/zoap/Makefile
index 56e33ab8afd..5647baa56ec 100644
--- a/tests/net/zoap/Makefile
+++ b/tests/net/zoap/Makefile
@@ -1,5 +1,4 @@
 BOARD ?= qemu_x86
-MDEF_FILE = prj.mdef
 CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/zoap/prj.mdef b/tests/net/zoap/prj.mdef
deleted file mode 100644
index 87c5b59d67e..00000000000
--- a/tests/net/zoap/prj.mdef
+++ /dev/null
@@ -1,5 +0,0 @@
-% Application       : Buffer test
-
-% TASK NAME         PRIO ENTRY           STACK GROUPS
-% ===================================================
-  TASK MAIN            7 main            2048 [EXE]