diff --git a/tests/net/6lo/Makefile b/tests/net/6lo/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/6lo/Makefile
+++ b/tests/net/6lo/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/6lo/prj_x86.conf b/tests/net/6lo/prj.conf
similarity index 100%
rename from tests/net/6lo/prj_x86.conf
rename to tests/net/6lo/prj.conf
diff --git a/tests/net/6lo/src/main.c b/tests/net/6lo/src/main.c
index 869f29fca74..ee58204eff0 100644
--- a/tests/net/6lo/src/main.c
+++ b/tests/net/6lo/src/main.c
@@ -106,7 +106,7 @@ uint8_t dst_mac[8] = { 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0xbb, 0xaa };
 
 /* Source and Destination addresses are contect related addresses. */
 #if defined(CONFIG_NET_6LO_CONTEXT)
-/* CONFIG_NET_MAX_6LO_CONTEXTS=2, defined in prj_x86.conf, If you want
+/* CONFIG_NET_MAX_6LO_CONTEXTS=2, defined in prj.conf, If you want
  * to increase this value, then add extra contexts here.
  */
 #define ctx1_prefix \
diff --git a/tests/net/arp/Makefile b/tests/net/arp/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/arp/Makefile
+++ b/tests/net/arp/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/arp/prj_x86.conf b/tests/net/arp/prj.conf
similarity index 100%
rename from tests/net/arp/prj_x86.conf
rename to tests/net/arp/prj.conf
diff --git a/tests/net/dhcpv4/Makefile b/tests/net/dhcpv4/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/dhcpv4/Makefile
+++ b/tests/net/dhcpv4/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/dhcpv4/prj_x86.conf b/tests/net/dhcpv4/prj.conf
similarity index 100%
rename from tests/net/dhcpv4/prj_x86.conf
rename to tests/net/dhcpv4/prj.conf
diff --git a/tests/net/fragment/Makefile b/tests/net/fragment/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/fragment/Makefile
+++ b/tests/net/fragment/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/fragment/prj_x86.conf b/tests/net/fragment/prj.conf
similarity index 100%
rename from tests/net/fragment/prj_x86.conf
rename to tests/net/fragment/prj.conf
diff --git a/tests/net/icmpv6/Makefile b/tests/net/icmpv6/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/icmpv6/Makefile
+++ b/tests/net/icmpv6/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/icmpv6/prj_x86.conf b/tests/net/icmpv6/prj.conf
similarity index 100%
rename from tests/net/icmpv6/prj_x86.conf
rename to tests/net/icmpv6/prj.conf
diff --git a/tests/net/ieee802154/Makefile b/tests/net/ieee802154/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/ieee802154/Makefile
+++ b/tests/net/ieee802154/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ieee802154/prj_x86.conf b/tests/net/ieee802154/prj.conf
similarity index 100%
rename from tests/net/ieee802154/prj_x86.conf
rename to tests/net/ieee802154/prj.conf
diff --git a/tests/net/ip-addr/Makefile b/tests/net/ip-addr/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/ip-addr/Makefile
+++ b/tests/net/ip-addr/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ip-addr/prj_x86.conf b/tests/net/ip-addr/prj.conf
similarity index 100%
rename from tests/net/ip-addr/prj_x86.conf
rename to tests/net/ip-addr/prj.conf
diff --git a/tests/net/ipv6/Makefile b/tests/net/ipv6/Makefile
index 7c881267141..b80ea39a8e5 100644
--- a/tests/net/ipv6/Makefile
+++ b/tests/net/ipv6/Makefile
@@ -1,7 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-ARCH ?= x86
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/ipv6/prj_x86.conf b/tests/net/ipv6/prj.conf
similarity index 100%
rename from tests/net/ipv6/prj_x86.conf
rename to tests/net/ipv6/prj.conf
diff --git a/tests/net/nbuf/Makefile b/tests/net/nbuf/Makefile
index aa4129dee2f..de33f156022 100644
--- a/tests/net/nbuf/Makefile
+++ b/tests/net/nbuf/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE ?= prj_x86.conf
+CONF_FILE ?= prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/nbuf/prj_x86.conf b/tests/net/nbuf/prj.conf
similarity index 100%
rename from tests/net/nbuf/prj_x86.conf
rename to tests/net/nbuf/prj.conf
diff --git a/tests/net/neighbor/Makefile b/tests/net/neighbor/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/neighbor/Makefile
+++ b/tests/net/neighbor/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/neighbor/prj_x86.conf b/tests/net/neighbor/prj.conf
similarity index 100%
rename from tests/net/neighbor/prj_x86.conf
rename to tests/net/neighbor/prj.conf
diff --git a/tests/net/tcp/Makefile b/tests/net/tcp/Makefile
index 2458c92c454..b80ea39a8e5 100644
--- a/tests/net/tcp/Makefile
+++ b/tests/net/tcp/Makefile
@@ -1,7 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
-ARCH ?= x86
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/tcp/prj_x86.conf b/tests/net/tcp/prj.conf
similarity index 100%
rename from tests/net/tcp/prj_x86.conf
rename to tests/net/tcp/prj.conf
diff --git a/tests/net/udp/Makefile b/tests/net/udp/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/udp/Makefile
+++ b/tests/net/udp/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/udp/prj_x86.conf b/tests/net/udp/prj.conf
similarity index 100%
rename from tests/net/udp/prj_x86.conf
rename to tests/net/udp/prj.conf
diff --git a/tests/net/utils/Makefile b/tests/net/utils/Makefile
index fa7f724b6bb..b80ea39a8e5 100644
--- a/tests/net/utils/Makefile
+++ b/tests/net/utils/Makefile
@@ -1,6 +1,6 @@
 BOARD ?= qemu_x86
 MDEF_FILE = prj.mdef
 KERNEL_TYPE ?= nano
-CONF_FILE = prj_$(ARCH).conf
+CONF_FILE = prj.conf
 
 include $(ZEPHYR_BASE)/Makefile.inc
diff --git a/tests/net/utils/prj_x86.conf b/tests/net/utils/prj.conf
similarity index 100%
rename from tests/net/utils/prj_x86.conf
rename to tests/net/utils/prj.conf