diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fcf9ffeb7..280b66653 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1873,6 +1873,18 @@ UT_017_05:
     - UT_T2_1
     - 8Mpsram
 
+UT_017_06:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_1
+
+UT_017_07:
+  <<: *unit_test_template
+  tags:
+    - ESP32_IDF
+    - UT_T1_1
+
 UT_601_01:
   <<: *unit_test_template
   tags:
diff --git a/components/esp_http_client/include/esp_http_client.h b/components/esp_http_client/include/esp_http_client.h
index a85df28c9..e4a9fba05 100644
--- a/components/esp_http_client/include/esp_http_client.h
+++ b/components/esp_http_client/include/esp_http_client.h
@@ -245,6 +245,7 @@ esp_err_t esp_http_client_get_header(esp_http_client_handle_t client, const char
  *
  * @return
  *     - ESP_OK
+ *     - ESP_ERR_INVALID_ARG
  */
 esp_err_t esp_http_client_get_username(esp_http_client_handle_t client, char **value);
 
diff --git a/components/esp_http_client/test/test_http_client.c b/components/esp_http_client/test/test_http_client.c
index 495ef09aa..f85e6970f 100644
--- a/components/esp_http_client/test/test_http_client.c
+++ b/components/esp_http_client/test/test_http_client.c
@@ -24,7 +24,7 @@
 #define USERNAME  "user"
 #define PASSWORD  "challenge"
 
-TEST_CASE("most_common_use", "Test in common case: Only URL and hostname are specified.")
+TEST_CASE("Test in common case: Only URL and hostname are specified.", "[ESP HTTP CLIENT]")
 {
     esp_http_client_config_t config_incorrect = {0};
 
@@ -50,7 +50,7 @@ TEST_CASE("most_common_use", "Test in common case: Only URL and hostname are spe
     TEST_ASSERT(esp_http_client_cleanup(client) == ESP_OK);
 }
 
-TEST_CASE("get_username_password", "Get username and password after initialization.")
+TEST_CASE("Get username and password after initialization.", "[ESP HTTP CLIENT]")
 {
     esp_http_client_config_t config_with_auth = {
         .host = HOST,
@@ -79,7 +79,7 @@ TEST_CASE("get_username_password", "Get username and password after initializati
  * Test case to test that, the esp_http_client_set_url won't drop username and password
  * when pass a path "/abc" for url.
  **/
-TEST_CASE("username_not_lost", "Username is unmodified when we change to new path")
+TEST_CASE("Username is unmodified when we change to new path", "[ESP HTTP CLIENT]")
 {
     esp_http_client_config_t config_with_auth = {
         .host = HOST,
@@ -106,7 +106,7 @@ TEST_CASE("username_not_lost", "Username is unmodified when we change to new pat
  * Test case to test that, the esp_http_client_set_url will reset username and password
  * when passing a full URL with username & password missing.
  **/
-TEST_CASE("username_is_reset", "Username is reset if new absolute URL doesnot specify username.")
+TEST_CASE("Username is reset if new absolute URL doesnot specify username.", "[ESP HTTP CLIENT]")
 {
     esp_http_client_config_t config_with_auth = {
         .host = HOST,