diff --git a/src/DIRAC/Core/Security/m2crypto/X509CRL.py b/src/DIRAC/Core/Security/m2crypto/X509CRL.py
index 29af038489f..f942c2c41a6 100644
--- a/src/DIRAC/Core/Security/m2crypto/X509CRL.py
+++ b/src/DIRAC/Core/Security/m2crypto/X509CRL.py
@@ -4,7 +4,7 @@
 import re
 import datetime
 
-import M2Crypto
+import M2Crypto.X509
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Utilities import DErrno
 from DIRAC.Core.Utilities.File import secureOpenForWrite
diff --git a/src/DIRAC/Core/Security/m2crypto/X509Certificate.py b/src/DIRAC/Core/Security/m2crypto/X509Certificate.py
index 3a46588aca4..31eba705971 100644
--- a/src/DIRAC/Core/Security/m2crypto/X509Certificate.py
+++ b/src/DIRAC/Core/Security/m2crypto/X509Certificate.py
@@ -10,7 +10,7 @@
 import random
 import time
 
-import M2Crypto
+import M2Crypto.X509
 
 
 from DIRAC import S_OK, S_ERROR
diff --git a/src/DIRAC/Core/Security/m2crypto/X509Chain.py b/src/DIRAC/Core/Security/m2crypto/X509Chain.py
index 0a566714281..5aa2659071b 100644
--- a/src/DIRAC/Core/Security/m2crypto/X509Chain.py
+++ b/src/DIRAC/Core/Security/m2crypto/X509Chain.py
@@ -8,7 +8,7 @@
 import hashlib
 import re
 
-import M2Crypto
+import M2Crypto.X509
 
 from DIRAC import S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client.Helpers import Registry
diff --git a/src/DIRAC/Core/Security/m2crypto/X509Request.py b/src/DIRAC/Core/Security/m2crypto/X509Request.py
index a9bb95467cf..917e3577586 100644
--- a/src/DIRAC/Core/Security/m2crypto/X509Request.py
+++ b/src/DIRAC/Core/Security/m2crypto/X509Request.py
@@ -1,7 +1,7 @@
 """ X509Request is a class for managing X509 requests with their Pkeys.
 It's main use is for proxy delegation.
 """
-import M2Crypto
+import M2Crypto.X509
 from DIRAC import S_OK, S_ERROR
 from DIRAC.Core.Security.m2crypto import DEFAULT_PROXY_STRENGTH
 from DIRAC.Core.Utilities import DErrno
diff --git a/src/DIRAC/Core/Tornado/Server/TornadoServer.py b/src/DIRAC/Core/Tornado/Server/TornadoServer.py
index 8d24545c89f..ccc0ea38f54 100644
--- a/src/DIRAC/Core/Tornado/Server/TornadoServer.py
+++ b/src/DIRAC/Core/Tornado/Server/TornadoServer.py
@@ -8,7 +8,7 @@
 import asyncio
 import psutil
 
-import M2Crypto
+import M2Crypto.SSL
 
 import tornado.iostream