diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index 1a9ada6d6f..87522c052c 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -520,6 +520,7 @@ START_TEST(ecore_test_ecore_con_shutdown_bef_init)
 {
    int ret;
 
+   eina_init();
    ret = ecore_con_shutdown();
    fail_if(ret != 0);
 
@@ -528,6 +529,7 @@ START_TEST(ecore_test_ecore_con_shutdown_bef_init)
 
    ret = ecore_con_shutdown();
    fail_if(ret != 0);
+   eina_shutdown();
 }
 END_TEST
 
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 6dba477167..5bb8ddb6b3 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -717,34 +717,6 @@ END_TEST
 
 /* IPv6 *****************************************************************/
 
-static Eina_Bool
-_ipv6_enabled(void)
-{
-   SOCKET fd;
-   struct sockaddr_in6 addr = {
-     .sin6_family = AF_INET6,
-   };
-   int r;
-
-   fd = socket(AF_INET6, SOCK_STREAM, 0);
-   if (fd == INVALID_SOCKET)
-     {
-        Eina_Error err = efl_net_socket_error_get();
-        fprintf(stderr, "WARNING: failed socket(AF_INET6, SOCK_STREAM, 0): %s\n", eina_error_msg_get(err));
-        return EINA_FALSE;
-     }
-
-   r = bind(fd, &addr, sizeof(addr));
-   if (r != 0)
-     {
-        Eina_Error err = efl_net_socket_error_get();
-        fprintf(stderr, "WARNING: failed bind(" SOCKET_FMT ", {.sin6_family=AF_INET6, .sin6_addr={0}, .sin6_port=0}, sizeof(struct sockaddr_in6)): %s\n", fd, eina_error_msg_get(err));
-     }
-
-   closesocket(fd);
-   return r == 0;
-}
-
 static void
 _ipv6_check(Eo *o, const struct sockaddr_in6 *addr)
 {
@@ -1294,9 +1266,12 @@ void ecore_con_test_efl_net_ip_address(TCase *tc)
    tcase_add_test(tc, ecore_test_efl_net_ip_address_ipv4_resolve_fail);
    tcase_add_test(tc, ecore_test_efl_net_ip_address_ipv4_checks);
 
-   if (!_ipv6_enabled())
+   if (!getenv("EFL_TEST_ECORE_CON_IPV6"))
      {
-        fputs("\nWARNING: your system has IPv6 disabled. Skipping IPv6 tests!\n\n", stderr);
+        fputs("\nWARNING: your system has IPv6 disabled. Skipping IPv6 tests!\n\n"
+              "\nexport EFL_TEST_ECORE_CON_IPV6=1\n"
+              "\nTo enable it\n",
+              stderr);
         return;
      }