diff --git a/tests/system_tests_http.py b/tests/system_tests_http.py
index 6048880ae..ee2b7d9a9 100644
--- a/tests/system_tests_http.py
+++ b/tests/system_tests_http.py
@@ -47,7 +47,9 @@ def setUpClass(cls):
     @classmethod
     def get(cls, url, use_ca=True):
         if use_ca:
-            http_data = urlopen(url, cafile=CA_CERT)
+            sctxt = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
+            sctxt.load_verify_locations(cafile=CA_CERT)
+            http_data = urlopen(url, context=sctxt)
         else:
             http_data = urlopen(url)
         return http_data.read().decode('utf-8')
@@ -226,7 +228,9 @@ def test_http_metrics(self):
 
         def _test(stat_names, port):
             # sanity check that all expected stats are reported
-            resp = urlopen(f"http://localhost:{port}/metrics", cafile=CA_CERT)
+            sctxt = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
+            sctxt.load_verify_locations(cafile=CA_CERT)
+            resp = urlopen(f"http://localhost:{port}/metrics", context=sctxt)
             self.assertEqual(200, resp.getcode())
             metrics = [x for x in resp.read().decode('utf-8').splitlines() if not x.startswith("#")]
 
@@ -284,7 +288,9 @@ def test_http_healthz(self):
         r = self.qdrouterd('metrics-test-router', config)
 
         def test(port):
-            result = urlopen("http://localhost:%d/healthz" % port, cafile=CA_CERT)
+            sctxt = ssl.SSLContext(protocol=ssl.PROTOCOL_TLS_CLIENT)
+            sctxt.load_verify_locations(cafile=CA_CERT)
+            result = urlopen("http://localhost:%d/healthz" % port, context=sctxt)
             self.assertEqual(200, result.getcode())
 
         # Sequential calls on multiple ports
diff --git a/tests/tsan.supp b/tests/tsan.supp
index 0af1d04c2..c0c245ea9 100644
--- a/tests/tsan.supp
+++ b/tests/tsan.supp
@@ -68,11 +68,6 @@ race:^qdr_link_process_deliveries$
 # ISSUE-65
 race:^qdr_delivery_continue_CT$
 
-# ISSUE-543
-race:^_lws_log$
-race:^_lws_logv$
-race:^__lws_logv$
-
 #
 # External libraries
 #
@@ -91,8 +86,16 @@ race:^listener_final_free$
 race:^pn_logger_reset_mask$
 race:^pni_logger_log$
 
-# DISPATCH-2151
+# libwebsockets logging is the king of races:
+# DISPATCH-2151, ISSUE-543,ISSUE-1507
+#
 race:^_lws_logv.part.0$
+race:^_lws_log$
+race:^_lws_logv$
+race:^__lws_logv$
+race:^qd_http_server_listen$
+race:^lws_snprintf$
+race:^handle_stats_results$
 
 # DISPATCH-2155
 race:^qd_connection_manager_delete_listener$