diff --git a/tests/net/lib/mqtt_packet/CMakeLists.txt b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/CMakeLists.txt
similarity index 100%
rename from tests/net/lib/mqtt_packet/CMakeLists.txt
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/CMakeLists.txt
diff --git a/tests/net/lib/mqtt_packet/README b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/README
similarity index 100%
rename from tests/net/lib/mqtt_packet/README
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/README
diff --git a/tests/net/lib/mqtt_packet/boards/cc3220sf_launchxl.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/boards/cc3220sf_launchxl.conf
similarity index 100%
rename from tests/net/lib/mqtt_packet/boards/cc3220sf_launchxl.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/boards/cc3220sf_launchxl.conf
diff --git a/tests/net/lib/mqtt_packet/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
similarity index 100%
rename from tests/net/lib/mqtt_packet/prj.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/prj.conf
diff --git a/tests/net/lib/mqtt_packet/src/mqtt_packet.c b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
similarity index 100%
rename from tests/net/lib/mqtt_packet/src/mqtt_packet.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/src/mqtt_packet.c
diff --git a/tests/net/lib/mqtt_packet/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
similarity index 100%
rename from tests/net/lib/mqtt_packet/testcase.yaml
rename to tests/net/lib/mqtt/v3_1_1/mqtt_packet/testcase.yaml
diff --git a/tests/net/lib/mqtt_publisher/CMakeLists.txt b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/CMakeLists.txt
similarity index 100%
rename from tests/net/lib/mqtt_publisher/CMakeLists.txt
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/CMakeLists.txt
diff --git a/tests/net/lib/mqtt_publisher/boards/cc3220sf_launchxl.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/boards/cc3220sf_launchxl.conf
similarity index 100%
rename from tests/net/lib/mqtt_publisher/boards/cc3220sf_launchxl.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/boards/cc3220sf_launchxl.conf
diff --git a/tests/net/lib/mqtt_publisher/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/prj.conf
similarity index 100%
rename from tests/net/lib/mqtt_publisher/prj.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/prj.conf
diff --git a/tests/net/lib/mqtt_publisher/prj_tls.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/prj_tls.conf
similarity index 100%
rename from tests/net/lib/mqtt_publisher/prj_tls.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/prj_tls.conf
diff --git a/tests/net/lib/mqtt_publisher/src/config.h b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/config.h
similarity index 100%
rename from tests/net/lib/mqtt_publisher/src/config.h
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/config.h
diff --git a/tests/net/lib/mqtt_publisher/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/main.c
similarity index 100%
rename from tests/net/lib/mqtt_publisher/src/main.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/main.c
diff --git a/tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/test_mqtt_publish.c
similarity index 100%
rename from tests/net/lib/mqtt_publisher/src/test_mqtt_publish.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/src/test_mqtt_publish.c
diff --git a/tests/net/lib/mqtt_publisher/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_publisher/testcase.yaml
similarity index 100%
rename from tests/net/lib/mqtt_publisher/testcase.yaml
rename to tests/net/lib/mqtt/v3_1_1/mqtt_publisher/testcase.yaml
diff --git a/tests/net/lib/mqtt_pubsub/CMakeLists.txt b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/CMakeLists.txt
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/CMakeLists.txt
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/CMakeLists.txt
diff --git a/tests/net/lib/mqtt_pubsub/boards/cc3220sf_launchxl.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/boards/cc3220sf_launchxl.conf
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/boards/cc3220sf_launchxl.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/boards/cc3220sf_launchxl.conf
diff --git a/tests/net/lib/mqtt_pubsub/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/prj.conf
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/prj.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/prj.conf
diff --git a/tests/net/lib/mqtt_pubsub/src/config.h b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/config.h
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/src/config.h
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/config.h
diff --git a/tests/net/lib/mqtt_pubsub/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/main.c
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/src/main.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/main.c
diff --git a/tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/test_mqtt_pubsub.c
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/src/test_mqtt_pubsub.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/src/test_mqtt_pubsub.c
diff --git a/tests/net/lib/mqtt_pubsub/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/testcase.yaml
similarity index 100%
rename from tests/net/lib/mqtt_pubsub/testcase.yaml
rename to tests/net/lib/mqtt/v3_1_1/mqtt_pubsub/testcase.yaml
diff --git a/tests/net/lib/mqtt_subscriber/CMakeLists.txt b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/CMakeLists.txt
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/CMakeLists.txt
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/CMakeLists.txt
diff --git a/tests/net/lib/mqtt_subscriber/boards/cc3220sf_launchxl.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/boards/cc3220sf_launchxl.conf
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/boards/cc3220sf_launchxl.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/boards/cc3220sf_launchxl.conf
diff --git a/tests/net/lib/mqtt_subscriber/prj.conf b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/prj.conf
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/prj.conf
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/prj.conf
diff --git a/tests/net/lib/mqtt_subscriber/src/config.h b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/config.h
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/src/config.h
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/config.h
diff --git a/tests/net/lib/mqtt_subscriber/src/main.c b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/main.c
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/src/main.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/main.c
diff --git a/tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/test_mqtt_subscribe.c
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/src/test_mqtt_subscribe.c
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/src/test_mqtt_subscribe.c
diff --git a/tests/net/lib/mqtt_subscriber/testcase.yaml b/tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/testcase.yaml
similarity index 100%
rename from tests/net/lib/mqtt_subscriber/testcase.yaml
rename to tests/net/lib/mqtt/v3_1_1/mqtt_subscriber/testcase.yaml