diff --git a/formats/format_ogg_speex.c b/formats/format_ogg_speex.c
index 331c544358d67075998c1db9677ab1f20e0df302..ff26c9d22cff8da35f16e08092a24e7804479622 100644
--- a/formats/format_ogg_speex.c
+++ b/formats/format_ogg_speex.c
@@ -338,6 +338,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "OGG/Speex audio",
+	.support_level = AST_MODULE_SUPPORT_EXTENDED,
 	.load = load_module,
 	.unload = unload_module,
 	.load_pri = AST_MODPRI_APP_DEPEND
diff --git a/tests/test_ari.c b/tests/test_ari.c
index a5db2284f2759566c1577a3997af6d20adf9ce3b..de552d03305974d66a758e45d015278974cf26da 100644
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -571,6 +571,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.requires = "res_ari",
diff --git a/tests/test_endpoints.c b/tests/test_endpoints.c
index 85c4e76df9837cb2841c40fb94b7c1e41cff29ac..754068a0a705a8ab1587b1dec2948b305f4ee4c3 100644
--- a/tests/test_endpoints.c
+++ b/tests/test_endpoints.c
@@ -151,6 +151,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 );
diff --git a/tests/test_json.c b/tests/test_json.c
index 394591fa4398cfe49039e767e2ca41ed67bf1791..2f710868ec4c90c092d3c9d36570119b1aeaa7ce 100644
--- a/tests/test_json.c
+++ b/tests/test_json.c
@@ -1816,6 +1816,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "JSON testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module
 );
diff --git a/tests/test_optional_api.c b/tests/test_optional_api.c
index 5c773899f49bf60b8071bbef6ca252f42059660d..fdf5d0cff4e80a1d1cd967fc2ab39ef770f1d035 100644
--- a/tests/test_optional_api.c
+++ b/tests/test_optional_api.c
@@ -181,6 +181,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 );
diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index 2c7906a65d3cb4ed0059b8216e480fe315e8c269..1d90a28f4bc1eeaa453ec8c59c2ae8aa3af8ce7d 100644
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -191,6 +191,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.requires = "res_stasis",
diff --git a/tests/test_stasis.c b/tests/test_stasis.c
index 9d42d007cdcad12921780cbfc4442dd7722a61ea..5bc38c50eef9b4480389a40a0347164d5a20e84c 100644
--- a/tests/test_stasis.c
+++ b/tests/test_stasis.c
@@ -2103,6 +2103,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module
 );
diff --git a/tests/test_stasis_channels.c b/tests/test_stasis_channels.c
index 57448736478ce1faa68c3e81d62a7d75d7f181d0..f73d882e3c3cfc361a9e0d70f957a107e8a1394d 100644
--- a/tests/test_stasis_channels.c
+++ b/tests/test_stasis_channels.c
@@ -327,6 +327,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, 0, "Stasis Channel Testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module
 );
diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 42c7532ebb7c0ea26063ff27c673f165e883f26b..9a49dd8fb9d5177445dafba334013e6d86b60b6b 100644
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -304,6 +304,7 @@ static int load_module(void)
 }
 
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing",
+	.support_level = AST_MODULE_SUPPORT_CORE,
 	.load = load_module,
 	.unload = unload_module,
 	.requires = "res_stasis_test",