diff --git a/swift/__init__.py b/swift/__init__.py
index 3b2bb6371e..88fc403cec 100644
--- a/swift/__init__.py
+++ b/swift/__init__.py
@@ -77,7 +77,7 @@ if (3, 0) <= sys.version_info[:2] <= (3, 5):
         del JsonLoadsPatcher
 
 
-warnings.filterwarnings('ignore', module='cryptography', message=(
+warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
     'Python 2 is no longer supported by the Python core team. '
     'Support for it is now deprecated in cryptography, '
     'and will be removed in a future release.'))
diff --git a/test/__init__.py b/test/__init__.py
index 6d7351955b..363efb53c7 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -38,7 +38,7 @@ except ImportError:
         return result[:_MAX_LENGTH] + ' [truncated]...'
 
 import warnings
-warnings.filterwarnings('ignore', module='cryptography', message=(
+warnings.filterwarnings('ignore', module='cryptography|OpenSSL', message=(
     'Python 2 is no longer supported by the Python core team. '
     'Support for it is now deprecated in cryptography, '
     'and will be removed in a future release.'))