diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -231,17 +231,24 @@ class PlatformTest(unittest.TestCase):
 
         else:
             # parent
             cpid, sts = os.waitpid(pid, 0)
             self.assertEqual(cpid, pid)
             self.assertEqual(sts, 0)
 
     def test_dist(self):
-        res = platform.dist()
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                'ignore',
+                'dist\(\) and linux_distribution\(\) '
+                'functions are deprecated .*',
+                PendingDeprecationWarning,
+            )
+            res = platform.dist()
 
     def test_libc_ver(self):
         import os
         if os.path.isdir(sys.executable) and \
            os.path.exists(sys.executable+'.exe'):
             # Cygwin horror
             executable = sys.executable + '.exe'
         else:
@@ -300,17 +307,24 @@ class PlatformTest(unittest.TestCase):
     def test_linux_distribution_encoding(self):
         # Issue #17429
         with tempfile.TemporaryDirectory() as tempdir:
             filename = os.path.join(tempdir, 'fedora-release')
             with open(filename, 'w', encoding='utf-8') as f:
                 f.write('Fedora release 19 (Schr\xf6dinger\u2019s Cat)\n')
 
             with mock.patch('platform._UNIXCONFDIR', tempdir):
-                distname, version, distid = platform.linux_distribution()
+                with warnings.catch_warnings():
+                    warnings.filterwarnings(
+                        'ignore',
+                        'dist\(\) and linux_distribution\(\) '
+                        'functions are deprecated .*',
+                        PendingDeprecationWarning,
+                    )
+                    distname, version, distid = platform.linux_distribution()
 
                 self.assertEqual(distname, 'Fedora')
             self.assertEqual(version, '19')
             self.assertEqual(distid, 'Schr\xf6dinger\u2019s Cat')
 
 
 class DeprecationTest(unittest.TestCase):
 
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -3289,28 +3289,36 @@ else:
                     s.connect((HOST, server.port))
                     with open(support.TESTFN, 'rb') as file:
                         s.sendfile(file)
                         self.assertEqual(s.recv(1024), TEST_DATA)
 
 
 def test_main(verbose=False):
     if support.verbose:
+        import warnings
         plats = {
             'Linux': platform.linux_distribution,
             'Mac': platform.mac_ver,
             'Windows': platform.win32_ver,
         }
-        for name, func in plats.items():
-            plat = func()
-            if plat and plat[0]:
-                plat = '%s %r' % (name, plat)
-                break
-        else:
-            plat = repr(platform.platform())
+        with warnings.catch_warnings():
+            warnings.filterwarnings(
+                'ignore',
+                'dist\(\) and linux_distribution\(\) '
+                'functions are deprecated .*',
+                PendingDeprecationWarning,
+            )
+            for name, func in plats.items():
+                plat = func()
+                if plat and plat[0]:
+                    plat = '%s %r' % (name, plat)
+                    break
+            else:
+                plat = repr(platform.platform())
         print("test_ssl: testing with %r %r" %
             (ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO))
         print("          under %s" % plat)
         print("          HAS_SNI = %r" % ssl.HAS_SNI)
         print("          OP_ALL = 0x%8x" % ssl.OP_ALL)
         try:
             print("          OP_NO_TLSv1_1 = 0x%8x" % ssl.OP_NO_TLSv1_1)
         except AttributeError: