diff --git a/pandas/_libs/tslib.pyx b/pandas/_libs/tslib.pyx
index 53bcf5be2586a..556cab565860c 100644
--- a/pandas/_libs/tslib.pyx
+++ b/pandas/_libs/tslib.pyx
@@ -50,8 +50,7 @@ from pandas._libs.tslibs.conversion cimport (
     _TSObject, convert_datetime_to_tsobject,
     get_datetime64_nanos)
 
-# many modules still look for NaT and iNaT here despite them not being needed
-from pandas._libs.tslibs.nattype import nat_strings, iNaT  # noqa:F821
+from pandas._libs.tslibs.nattype import nat_strings
 from pandas._libs.tslibs.nattype cimport (
     checknull_with_nat, NPY_NAT, c_NaT as NaT)
 
diff --git a/pandas/core/algorithms.py b/pandas/core/algorithms.py
index cc0fdae094cf9..c2115094918e5 100644
--- a/pandas/core/algorithms.py
+++ b/pandas/core/algorithms.py
@@ -9,8 +9,7 @@
 
 import numpy as np
 
-from pandas._libs import Timestamp, algos, hashtable as htable, lib
-from pandas._libs.tslib import iNaT
+from pandas._libs import Timestamp, algos, hashtable as htable, iNaT, lib
 from pandas._typing import AnyArrayLike, ArrayLike, DtypeObj
 from pandas.util._decorators import doc
 
diff --git a/pandas/tests/base/test_fillna.py b/pandas/tests/base/test_fillna.py
index 630ecdacd91d1..c6f58af4c5c3a 100644
--- a/pandas/tests/base/test_fillna.py
+++ b/pandas/tests/base/test_fillna.py
@@ -6,7 +6,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 from pandas.core.dtypes.common import needs_i8_conversion
 from pandas.core.dtypes.generic import ABCMultiIndex
diff --git a/pandas/tests/base/test_unique.py b/pandas/tests/base/test_unique.py
index eca402af252f8..9703faff40aff 100644
--- a/pandas/tests/base/test_unique.py
+++ b/pandas/tests/base/test_unique.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 from pandas.core.dtypes.common import is_datetime64tz_dtype, needs_i8_conversion
 
diff --git a/pandas/tests/base/test_value_counts.py b/pandas/tests/base/test_value_counts.py
index 2514b11613ef6..de04c30432e6f 100644
--- a/pandas/tests/base/test_value_counts.py
+++ b/pandas/tests/base/test_value_counts.py
@@ -5,7 +5,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 from pandas.compat.numpy import np_array_datetime64_compat
 
 from pandas.core.dtypes.common import needs_i8_conversion
diff --git a/pandas/tests/extension/test_period.py b/pandas/tests/extension/test_period.py
index 11b41eedd5d51..b1eb276bfc227 100644
--- a/pandas/tests/extension/test_period.py
+++ b/pandas/tests/extension/test_period.py
@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 from pandas.core.dtypes.dtypes import PeriodDtype
 
diff --git a/pandas/tests/frame/indexing/test_indexing.py b/pandas/tests/frame/indexing/test_indexing.py
index ed3c4689c92d9..3865ea64ee479 100644
--- a/pandas/tests/frame/indexing/test_indexing.py
+++ b/pandas/tests/frame/indexing/test_indexing.py
@@ -4,7 +4,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 from pandas.core.dtypes.common import is_float_dtype, is_integer
 
diff --git a/pandas/tests/indexes/common.py b/pandas/tests/indexes/common.py
index 8e8f4738d30dd..0f9509c372bdf 100644
--- a/pandas/tests/indexes/common.py
+++ b/pandas/tests/indexes/common.py
@@ -4,7 +4,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 from pandas.core.dtypes.common import is_datetime64tz_dtype
 from pandas.core.dtypes.dtypes import CategoricalDtype
diff --git a/pandas/tests/series/methods/test_rank.py b/pandas/tests/series/methods/test_rank.py
index caaffb7d5b61f..6d3c37659f5c4 100644
--- a/pandas/tests/series/methods/test_rank.py
+++ b/pandas/tests/series/methods/test_rank.py
@@ -3,8 +3,8 @@
 import numpy as np
 import pytest
 
+from pandas._libs import iNaT
 from pandas._libs.algos import Infinity, NegInfinity
-from pandas._libs.tslib import iNaT
 import pandas.util._test_decorators as td
 
 from pandas import NaT, Series, Timestamp, date_range
diff --git a/pandas/tests/series/test_constructors.py b/pandas/tests/series/test_constructors.py
index d78324d92a036..1dd410ad02ee0 100644
--- a/pandas/tests/series/test_constructors.py
+++ b/pandas/tests/series/test_constructors.py
@@ -5,8 +5,7 @@
 import numpy.ma as ma
 import pytest
 
-from pandas._libs import lib
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT, lib
 
 from pandas.core.dtypes.common import is_categorical_dtype, is_datetime64tz_dtype
 from pandas.core.dtypes.dtypes import CategoricalDtype
diff --git a/pandas/tests/series/test_missing.py b/pandas/tests/series/test_missing.py
index a64a6bc584cf6..3b8c2e595148e 100644
--- a/pandas/tests/series/test_missing.py
+++ b/pandas/tests/series/test_missing.py
@@ -4,7 +4,7 @@
 import pytest
 import pytz
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 import pandas as pd
 from pandas import (
diff --git a/pandas/tests/test_take.py b/pandas/tests/test_take.py
index 2534f1849cf61..2a42eb5d73136 100644
--- a/pandas/tests/test_take.py
+++ b/pandas/tests/test_take.py
@@ -4,7 +4,7 @@
 import numpy as np
 import pytest
 
-from pandas._libs.tslib import iNaT
+from pandas._libs import iNaT
 
 import pandas._testing as tm
 import pandas.core.algorithms as algos
diff --git a/pandas/tests/tslibs/test_conversion.py b/pandas/tests/tslibs/test_conversion.py
index 96c2d6bbd8106..d0066988faec7 100644
--- a/pandas/tests/tslibs/test_conversion.py
+++ b/pandas/tests/tslibs/test_conversion.py
@@ -4,8 +4,7 @@
 import pytest
 from pytz import UTC
 
-from pandas._libs.tslib import iNaT
-from pandas._libs.tslibs import conversion, timezones, tzconversion
+from pandas._libs.tslibs import conversion, iNaT, timezones, tzconversion
 
 from pandas import Timestamp, date_range
 import pandas._testing as tm