diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index e30d9bfb..eb05fedc 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -15,53 +15,52 @@ AM_CPPFLAGS = \
   $(LIBCURL_CPPFLAGS)
 
 check_PROGRAMS = \
-  tls_daemon_options_test \
-  tls_authentication_test \
-  mhds_multi_daemon_test \
-  mhds_get_test \
-  mhds_get_test_select \
-  mhds_session_info_test \
-  tls_thread_mode_test \
-  tls_multi_thread_mode_test \
-  tls_session_time_out_test \
+  test_tls_options \
+  test_tls_authentication \
+  test_https_multi_daemon \
+  test_https_get \
+  test_https_get_select \
+  test_https_get_parallel \
+  test_https_get_parallel_threads \
+  test_https_session_info \
+  test_https_time_out \
   test_empty_response
 
 EXTRA_DIST = cert.pem key.pem tls_test_keys.h tls_test_common.h
 
-# tls_authentication_test currently fails for unknown reasons
 TESTS = \
-  tls_daemon_options_test \
-  mhds_multi_daemon_test \
-  mhds_get_test \
-  mhds_get_test_select \
-  mhds_session_info_test \
-  tls_thread_mode_test \
-  tls_multi_thread_mode_test \
-  tls_session_time_out_test \
-  tls_authentication_test \
+  test_tls_options \
+  test_https_multi_daemon \
+  test_https_get \
+  test_https_get_select \
+  test_https_get_parallel \
+  test_https_get_parallel_threads \
+  test_https_session_info \
+  test_https_time_out \
+  test_tls_authentication \
   test_empty_response
 
-# cURL dependent tests
-tls_session_time_out_test_SOURCES = \
-  tls_session_time_out_test.c \
+
+test_https_time_out_SOURCES = \
+  test_https_time_out.c \
   tls_test_common.c
-tls_session_time_out_test_LDADD  = \
+test_https_time_out_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-tls_daemon_options_test_SOURCES = \
-  tls_daemon_options_test.c \
+test_tls_options_SOURCES = \
+  test_tls_options.c \
   tls_test_common.c
-tls_daemon_options_test_LDADD = \
+test_tls_options_LDADD = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-tls_thread_mode_test_SOURCES = \
-  tls_thread_mode_test.c \
+test_https_get_parallel_SOURCES = \
+  test_https_get_parallel.c \
   tls_test_common.c
-tls_thread_mode_test_LDADD = \
+test_https_get_parallel_LDADD = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
@@ -74,51 +73,50 @@ test_empty_response_LDADD = \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-tls_multi_thread_mode_test_SOURCES = \
-  tls_multi_thread_mode_test.c \
+test_https_get_parallel_threads_SOURCES = \
+  test_https_get_parallel_threads.c \
   tls_test_common.c
-tls_multi_thread_mode_test_LDADD = \
+test_https_get_parallel_threads_LDADD = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-tls_authentication_test_SOURCES = \
-  tls_authentication_test.c \
+test_tls_authentication_SOURCES = \
+  test_tls_authentication.c \
   tls_test_common.c
-tls_authentication_test_LDADD  = \
+test_tls_authentication_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-mhds_session_info_test_SOURCES = \
-  mhds_session_info_test.c \
+test_https_session_info_SOURCES = \
+  test_https_session_info.c \
   tls_test_common.c
-mhds_session_info_test_LDADD  = \
+test_https_session_info_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-mhds_multi_daemon_test_SOURCES = \
-  mhds_multi_daemon_test.c \
+test_https_multi_daemon_SOURCES = \
+  test_https_multi_daemon.c \
   tls_test_common.c
-mhds_multi_daemon_test_LDADD  = \
+test_https_multi_daemon_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-mhds_get_test_SOURCES = \
-  mhds_get_test.c \
+test_https_get_SOURCES = \
+  test_https_get.c \
   tls_test_common.c
-mhds_get_test_LDADD  = \
+test_https_get_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
 
-
-mhds_get_test_select_SOURCES = \
-  mhds_get_test_select.c \
+test_https_get_select_SOURCES = \
+  test_https_get_select.c \
   tls_test_common.c
-mhds_get_test_select_LDADD  = \
+test_https_get_select_LDADD  = \
   $(top_builddir)/src/testcurl/libcurl_version_check.a \
   $(top_builddir)/src/daemon/libmicrohttpd.la \
   @LIBCURL@ -lgnutls @LIBGCRYPT_LIBS@
diff --git a/src/testcurl/https/mhds_get_test.c b/src/testcurl/https/test_https_get.c
similarity index 100%
rename from src/testcurl/https/mhds_get_test.c
rename to src/testcurl/https/test_https_get.c
diff --git a/src/testcurl/https/tls_thread_mode_test.c b/src/testcurl/https/test_https_get_parallel.c
similarity index 97%
rename from src/testcurl/https/tls_thread_mode_test.c
rename to src/testcurl/https/test_https_get_parallel.c
index 6bab4510..4a9dd9dc 100644
--- a/src/testcurl/https/tls_thread_mode_test.c
+++ b/src/testcurl/https/test_https_get_parallel.c
@@ -23,8 +23,6 @@
  * @brief  Testcase for libmicrohttpd HTTPS GET operations
  * @author Sagie Amir
  * @author Christian Grothoff
- *
- * TODO: add test for external select!
  */
 
 #include "platform.h"
@@ -65,7 +63,7 @@ https_transfer_thread_adapter (void *args)
  *
  * @return: 0 upon all client requests returning '0', -1 otherwise.
  *
- * TODO : make client_count a parameter - numver of curl client threads to spawn
+ * TODO : make client_count a parameter - number of curl client threads to spawn
  */
 static int
 test_single_client (void *cls, const char *cipher_suite,
diff --git a/src/testcurl/https/tls_multi_thread_mode_test.c b/src/testcurl/https/test_https_get_parallel_threads.c
similarity index 100%
rename from src/testcurl/https/tls_multi_thread_mode_test.c
rename to src/testcurl/https/test_https_get_parallel_threads.c
diff --git a/src/testcurl/https/mhds_get_test_select.c b/src/testcurl/https/test_https_get_select.c
similarity index 100%
rename from src/testcurl/https/mhds_get_test_select.c
rename to src/testcurl/https/test_https_get_select.c
diff --git a/src/testcurl/https/mhds_multi_daemon_test.c b/src/testcurl/https/test_https_multi_daemon.c
similarity index 100%
rename from src/testcurl/https/mhds_multi_daemon_test.c
rename to src/testcurl/https/test_https_multi_daemon.c
diff --git a/src/testcurl/https/mhds_session_info_test.c b/src/testcurl/https/test_https_session_info.c
similarity index 100%
rename from src/testcurl/https/mhds_session_info_test.c
rename to src/testcurl/https/test_https_session_info.c
diff --git a/src/testcurl/https/tls_session_time_out_test.c b/src/testcurl/https/test_https_time_out.c
similarity index 100%
rename from src/testcurl/https/tls_session_time_out_test.c
rename to src/testcurl/https/test_https_time_out.c
diff --git a/src/testcurl/https/tls_authentication_test.c b/src/testcurl/https/test_tls_authentication.c
similarity index 100%
rename from src/testcurl/https/tls_authentication_test.c
rename to src/testcurl/https/test_tls_authentication.c
diff --git a/src/testcurl/https/tls_extension_test.c b/src/testcurl/https/test_tls_extensions.c
similarity index 100%
rename from src/testcurl/https/tls_extension_test.c
rename to src/testcurl/https/test_tls_extensions.c
diff --git a/src/testcurl/https/tls_daemon_options_test.c b/src/testcurl/https/test_tls_options.c
similarity index 100%
rename from src/testcurl/https/tls_daemon_options_test.c
rename to src/testcurl/https/test_tls_options.c