15 files changed, 4 insertions, 16 deletions
diff --git a/Lib/test/test_codecmaps_cn.py b/Lib/test/test_codecmaps_cn.py
index f1bd3840c9a..89e51c6e2a1 100644
--- a/Lib/test/test_codecmaps_cn.py
+++ b/Lib/test/test_codecmaps_cn.py
@@ -3,7 +3,6 @@
 #   Codec mapping tests for PRC encodings
 #
 
-from test import support
 from test import multibytecodec_support
 import unittest
 
diff --git a/Lib/test/test_codecmaps_hk.py b/Lib/test/test_codecmaps_hk.py
index 4c0c4156da9..7a48d24fddb 100644
--- a/Lib/test/test_codecmaps_hk.py
+++ b/Lib/test/test_codecmaps_hk.py
@@ -3,7 +3,6 @@
 #   Codec mapping tests for HongKong encodings
 #
 
-from test import support
 from test import multibytecodec_support
 import unittest
 
diff --git a/Lib/test/test_codecmaps_kr.py b/Lib/test/test_codecmaps_kr.py
index 6cb41c8b290..471cd749b8c 100644
--- a/Lib/test/test_codecmaps_kr.py
+++ b/Lib/test/test_codecmaps_kr.py
@@ -3,7 +3,6 @@
 #   Codec mapping tests for ROK encodings
 #
 
-from test import support
 from test import multibytecodec_support
 import unittest
 
diff --git a/Lib/test/test_codecmaps_tw.py b/Lib/test/test_codecmaps_tw.py
index 2ea44b56f1f..145a97d511e 100644
--- a/Lib/test/test_codecmaps_tw.py
+++ b/Lib/test/test_codecmaps_tw.py
@@ -3,7 +3,6 @@
 #   Codec mapping tests for ROC encodings
 #
 
-from test import support
 from test import multibytecodec_support
 import unittest
 
diff --git a/Lib/test/test_dictcomps.py b/Lib/test/test_dictcomps.py
index 3c8b95cf324..08730718834 100644
--- a/Lib/test/test_dictcomps.py
+++ b/Lib/test/test_dictcomps.py
@@ -1,7 +1,5 @@
 import unittest
 
-from test import support
-
 # For scope testing.
 g = "Global variable"
 
diff --git a/Lib/test/test_email/test_asian_codecs.py b/Lib/test/test_email/test_asian_codecs.py
index 089269f5448..42bb3e9ee3b 100644
--- a/Lib/test/test_email/test_asian_codecs.py
+++ b/Lib/test/test_email/test_asian_codecs.py
@@ -3,7 +3,6 @@
 # email package unit tests for (optional) Asian codecs
 
 import unittest
-from test.support import run_unittest
 
 from test.test_email.test_email import TestEmailBase
 from email.charset import Charset
diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index 67c3d864d8e..65be30f0b2e 100644
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -7,7 +7,7 @@ from weakref import proxy
 import io
 import _pyio as pyio
 
-from test.support import TESTFN, run_unittest
+from test.support import TESTFN
 from collections import UserList
 
 class AutoFileTests:
diff --git a/Lib/test/test_fileinput.py b/Lib/test/test_fileinput.py
index bdf4252d8dc..4f67c25f908 100644
--- a/Lib/test/test_fileinput.py
+++ b/Lib/test/test_fileinput.py
@@ -22,7 +22,7 @@ except ImportError:
 from io import BytesIO, StringIO
 from fileinput import FileInput, hook_encoded
 
-from test.support import verbose, TESTFN, run_unittest, check_warnings
+from test.support import verbose, TESTFN, check_warnings
 from test.support import unlink as safe_unlink
 from test import support
 from unittest import mock
diff --git a/Lib/test/test_htmlparser.py b/Lib/test/test_htmlparser.py
index 11420b2c846..a7f53d382e1 100644
--- a/Lib/test/test_htmlparser.py
+++ b/Lib/test/test_htmlparser.py
@@ -3,7 +3,6 @@
 import html.parser
 import pprint
 import unittest
-from test import support
 
 
 class EventCollector(html.parser.HTMLParser):
diff --git a/Lib/test/test_importlib/test_namespace_pkgs.py b/Lib/test/test_importlib/test_namespace_pkgs.py
index 6639612631c..cb49f19a6dd 100644
--- a/Lib/test/test_importlib/test_namespace_pkgs.py
+++ b/Lib/test/test_importlib/test_namespace_pkgs.py
@@ -7,7 +7,6 @@ import types
 import unittest
 
 from test.test_importlib import util
-from test.support import run_unittest
 
 # needed tests:
 #
diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py
index 152f5fc0cb6..41c9752e557 100644
--- a/Lib/test/test_iterlen.py
+++ b/Lib/test/test_iterlen.py
@@ -42,7 +42,6 @@ enumerate(iter('abc')).
 """
 
 import unittest
-from test import support
 from itertools import repeat
 from collections import deque
 from operator import length_hint
diff --git a/Lib/test/test_macpath.py b/Lib/test/test_macpath.py
index 80bec7a799a..0698ff5f6b5 100644
--- a/Lib/test/test_macpath.py
+++ b/Lib/test/test_macpath.py
@@ -1,5 +1,5 @@
 import macpath
-from test import support, test_genericpath
+from test import test_genericpath
 import unittest
 
 
diff --git a/Lib/test/test_sched.py b/Lib/test/test_sched.py
index fe8e7850920..f86f599afca 100644
--- a/Lib/test/test_sched.py
+++ b/Lib/test/test_sched.py
@@ -2,7 +2,6 @@ import queue
 import sched
 import time
 import unittest
-from test import support
 try:
     import threading
 except ImportError:
diff --git a/Lib/test/test_tools/test_pdeps.py b/Lib/test/test_tools/test_pdeps.py
index 6b5d5c883dc..0097623deda 100644
--- a/Lib/test/test_tools/test_pdeps.py
+++ b/Lib/test/test_tools/test_pdeps.py
@@ -3,7 +3,6 @@
 import os
 import unittest
 import tempfile
-from test import support
 
 from test.test_tools import scriptsdir, skip_if_missing, import_tool
 
diff --git a/Lib/test/test_userstring.py b/Lib/test/test_userstring.py
index 9bc8edd99d2..35dce2c8d66 100644
--- a/Lib/test/test_userstring.py
+++ b/Lib/test/test_userstring.py
@@ -3,7 +3,7 @@
 
 import string
 import unittest
-from test import support, string_tests
+from test import string_tests
 
 from collections import UserString