diff --git a/configure.ac b/configure.ac
index 2e046450..ce7f30d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3671,6 +3671,8 @@ AC_SUBST([AM_UBSAN_OPTIONS])
 AC_SUBST([AM_LSAN_OPTIONS])
 AC_SUBST([AM_TESTS_ENVIRONMENT])
 
+AM_CONDITIONAL([USE_BROKEN_TLS_TESTS],[false])
+
 MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS -export-dynamic -no-undefined"
 
 AC_SUBST([CPU_COUNT])
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index a051ad1b..b9917abc 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -31,17 +31,23 @@ if HAVE_POSIX_THREADS
 endif
 
 THREAD_ONLY_TESTS = \
-  test_tls_options \
   test_tls_authentication \
   $(HTTPS_PARALLEL_TESTS) \
   $(TEST_HTTPS_SNI) \
-  test_https_session_info \
   test_https_multi_daemon \
   test_https_get \
   test_empty_response \
   test_https_get_iovec \
   $(EMPTY_ITEM)
 
+# The next tests are badly broken and fixed in next MHD version only
+if USE_BROKEN_TLS_TESTS
+THREAD_ONLY_TESTS += \
+  test_tls_options \
+  test_https_session_info \
+  $(EMPTY_ITEM)
+endif
+
 if !HAVE_GNUTLS_MTHREAD_BROKEN
 THREAD_ONLY_TESTS += \
   test_https_time_out \