diff --git a/scapy/config.py b/scapy/config.py
index b0f54d4c832a192c0eaf10fcdd8d78a15223d1be..b4a0d135b65e55bb6e257d51f089c97f9efde067 100755
--- a/scapy/config.py
+++ b/scapy/config.py
@@ -431,7 +431,7 @@ debug_tls:When 1, print some TLS session secrets when they are computed.
     netcache = NetCache()
     geoip_city = '/usr/share/GeoIP/GeoIPCity.dat'
     geoip_city_ipv6 = '/usr/share/GeoIP/GeoIPCityv6.dat'
-    load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs", "tls",
+    load_layers = ["l2", "inet", "dhcp", "dns", "dot11", "gprs",
                    "hsrp", "inet6", "ir", "isakmp", "l2tp", "mgcp",
                    "mobileip", "netbios", "netflow", "ntp", "ppp", "pptp",
                    "radius", "rip", "rtp", "skinny", "smb", "snmp",
diff --git a/test/configs/travis.utsc b/test/configs/travis.utsc
index c8dd3cf7b3c67cdf95af5d2c83e704d8f2eddbba..933451ff31e46326fd50713c2d6d2fbec30e3881 100644
--- a/test/configs/travis.utsc
+++ b/test/configs/travis.utsc
@@ -5,7 +5,10 @@
   ],
   "onlyfailed": true,
   "preexec": {
-    "../scapy/contrib/*.uts": "load_contrib(\"%name%\")"
+    "../scapy/contrib/*.uts": "load_contrib(\"%name%\")",
+    "cert.uts": "load_layer(\"tls\")",
+    "sslv2.uts": "load_layer(\"tls\")",
+    "tls*.uts": "load_layer(\"tls\")"
   },
   "format": "text"
 }
diff --git a/test/configs/windows.utsc b/test/configs/windows.utsc
index 462da81c53b0965a7a65ea4a36c7f6ab54c25d86..42b6759bae30dfc33fe32591bbaea0c370cabf16 100644
--- a/test/configs/windows.utsc
+++ b/test/configs/windows.utsc
@@ -5,7 +5,10 @@
   ],
   "onlyfailed": true,
   "preexec": {
-    "scapy\\contrib\\*.uts": "load_contrib(\"%name%\")"
+    "scapy\\contrib\\*.uts": "load_contrib(\"%name%\")",
+    "test\\cert.uts": "load_layer(\"tls\")",
+    "test\\sslv2.uts": "load_layer(\"tls\")",
+    "test\\tls*.uts": "load_layer(\"tls\")"
   },
   "format": "text",
   "kw_ko": [
diff --git a/test/configs/windows2.utsc b/test/configs/windows2.utsc
index 843ab142388a4a38826b50234d11ab8ac0ca34f9..0f708f8f4932da0b2bcb8abd696e272b9ef46450 100644
--- a/test/configs/windows2.utsc
+++ b/test/configs/windows2.utsc
@@ -5,7 +5,10 @@
   ],
   "onlyfailed": true,
   "preexec": {
-    "..\\scapy\\contrib\\*.uts": "load_contrib(\"%name%\")"
+    "..\\scapy\\contrib\\*.uts": "load_contrib(\"%name%\")",
+    "cert.uts": "load_layer(\"tls\")",
+    "sslv2.uts": "load_layer(\"tls\")",
+    "tls*.uts": "load_layer(\"tls\")"
   },
   "format": "html",
   "kw_ko": [