diff --git a/scapy/all.py b/scapy/all.py
index 9ad308de32d09f13ca8f795e02ddbd9c6f82b19d..9d6e5b5d3f80e7ab619869b98242d468bcc23b18 100644
--- a/scapy/all.py
+++ b/scapy/all.py
@@ -38,11 +38,6 @@ from scapy.autorun import *
 from scapy.main import *
 
 from scapy.layers.all import *
-if "tls" in conf.load_layers:
-    try:
-        from scapy.layers.tls.all import *
-    except ImportError:
-        pass
 
 from scapy.asn1.asn1 import *
 from scapy.asn1.ber import *
diff --git a/scapy/config.py b/scapy/config.py
index 925cd667e18f323157d4548f2c469e3db5aba4f2..3408648b7cad0f6870f0da8cee0628307962043e 100755
--- a/scapy/config.py
+++ b/scapy/config.py
@@ -436,7 +436,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/scapy/layers/all.py b/scapy/layers/all.py
index 561dcc8f0b9ab82222574048e96639d1a20836fd..18e8e2a1508db0f63122f2461d7413e9736e4f9c 100644
--- a/scapy/layers/all.py
+++ b/scapy/layers/all.py
@@ -39,11 +39,14 @@ def _import_star(m):
                 __all__.append(name)
                 globals()[name] = sym
 
+LAYER_ALIASES = {
+    "tls": "tls.all",
+}
+
 for _l in conf.load_layers:
     log_loading.debug("Loading layer %s" % _l)
     try:
-        if _l != "tls":
-            _import_star(_l)
+        _import_star(LAYER_ALIASES.get(_l, _l))
     except Exception as e:
         log.warning("can't import layer %s: %s" % (_l,e))
 
diff --git a/scapy/main.py b/scapy/main.py
index dbe0682865c3ab5859b131ff1a9e6455da78c842..287bcd7d3857169aa135ffe4e68c935b9807485c 100644
--- a/scapy/main.py
+++ b/scapy/main.py
@@ -18,6 +18,7 @@ import importlib
 ignored = list(six.moves.builtins.__dict__.keys())
 
 from scapy.error import *
+from scapy.layers.all import LAYER_ALIASES
 
 def _probe_config_file(cf):
     cf_path = os.path.join(os.path.expanduser("~"), cf)
@@ -83,7 +84,7 @@ def load_module(name):
     _load("scapy.modules."+name)
 
 def load_layer(name):
-    _load("scapy.layers."+name)
+    _load("scapy.layers." + LAYER_ALIASES.get(name, name))
 
 def load_contrib(name):
     try:
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": [