diff --git a/test/gnuma_loopy_transforms.py b/test/gnuma_loopy_transforms.py
index 1b8842a661189edea34e6742f4f52b4e3eeb1788..afffb6724d9e59c39c2f89680cf35e38fd78b037 100644
--- a/test/gnuma_loopy_transforms.py
+++ b/test/gnuma_loopy_transforms.py
@@ -14,7 +14,7 @@ def pick_apart_float_cast(value):
     return float(fval_match.group(2))
 
 
-def fix_euler_parameters(kernel, p_p0, p_Gamma, p_R):  # noqa
+def fix_euler_parameters(kernel, p_p0, p_Gamma, p_R):  # noqa: N803
     return lp.fix_parameters(
         kernel,
         p_p0=pick_apart_float_cast(p_p0),
@@ -36,7 +36,7 @@ def set_D_storage_format(kernel):  # noqa: N802
     return lp.tag_array_axes(kernel, "D", "f,f")
 
 
-def set_up_volume_loop(kernel, Nq):  # noqa
+def set_up_volume_loop(kernel, Nq):  # noqa: N803
     kernel = lp.fix_parameters(kernel, Nq=Nq)
     kernel = lp.prioritize_loops(kernel, "e,k,j,i")
     kernel = lp.tag_inames(kernel, {"e": "g.0", "j": "l.1", "i": "l.0"})
diff --git a/test/test_apps.py b/test/test_apps.py
index 8c32aa9ac4acf346d1da3059aa8edef460dd0c2d..862b3946324051e39f6b9f170bb23ea65b06a4f4 100644
--- a/test/test_apps.py
+++ b/test/test_apps.py
@@ -450,7 +450,7 @@ def test_lbm(ctx_factory):
     # Example by Loic Gouarin <loic.gouarin@math.u-psud.fr>
     knl = lp.make_kernel(
         "{[ii,jj]:0<=ii<nx-2 and 0<=jj<ny-2}",
-        """  # noqa (silences flake8 line length warning)
+        """
         i := ii + 1
         j := jj + 1
         for ii, jj
@@ -621,7 +621,7 @@ def test_poisson_fem(ctx_factory):
 def test_domain_tree_nesting():
     # From https://github.com/inducer/loopy/issues/78
 
-    AS = lp.AddressSpace        # noqa
+    AS = lp.AddressSpace        # noqa: N806
 
     out_map = np.array([1, 2], dtype=np.int32)
     if_val = np.array([-1, 0], dtype=np.int32)
@@ -629,7 +629,7 @@ def test_domain_tree_nesting():
     num_vals = np.array([2, 4], dtype=np.int32)
     num_vals_offset = np.array(np.cumsum(num_vals) - num_vals, dtype=np.int32)
 
-    TV = lp.TemporaryVariable  # noqa
+    TV = lp.TemporaryVariable  # noqa: N806
 
     knl = lp.make_kernel(["{[i]: 0 <= i < 12}",
                     "{[j]: 0 <= j < 100}",
diff --git a/test/test_c_execution.py b/test/test_c_execution.py
index 33e50e3ab1eea4645d6df3bfc8899b6ece5e1b5d..699c8f16a8dcbbe393efcdd438f6233b119c3470 100644
--- a/test/test_c_execution.py
+++ b/test/test_c_execution.py
@@ -280,7 +280,7 @@ def test_c_execution_with_global_temporaries():
     # global constant temporaries is None
 
     from loopy.target.c import ExecutableCTarget
-    AS = lp.AddressSpace        # noqa
+    AS = lp.AddressSpace        # noqa: N806
     n = 10
 
     knl = lp.make_kernel("{[i]: 0 <= i < n}",
diff --git a/test/test_dg.py b/test/test_dg.py
index e19507260fc52df172e042bf5e6b254aeee04228..47d02a61101d4b2754e30d803ba85db83250a5c5 100644
--- a/test/test_dg.py
+++ b/test/test_dg.py
@@ -20,18 +20,21 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-
-import logging  # noqa
+import logging
 
 import numpy as np
+
 import pyopencl as cl
 import pyopencl.array
-from pyopencl.tools import (  # noqa
+from pyopencl.tools import (  # noqa: F401
     pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 
 import loopy as lp
-from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
+from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
+
+
+logger = logging.getLogger(__name__)
 
 
 def test_dg_volume(ctx_factory):
@@ -43,10 +46,10 @@ def test_dg_volume(ctx_factory):
 
     order = "F"
 
-    N = 3  # noqa
-    Np = (N+1)*(N+2)*(N+3)//6  # noqa
+    N = 3  # noqa: N806
+    Np = (N+1)*(N+2)*(N+3)//6  # noqa: N806
 
-    K = 10000  # noqa
+    K = 10000  # noqa: N806
 
     knl = lp.make_kernel([
             "{[n,m,k]: 0<= n,m < Np and 0<= k < K}",
@@ -178,12 +181,12 @@ def no_test_dg_surface(ctx_factory):
 
     order = "F"
 
-    N = 3  # noqa
-    Np = (N+1)*(N+2)*(N+3)//6  # noqa
-    Nfp = (N+1)*(N+2)//2  # noqa
-    Nfaces = 4  # noqa
+    N = 3  # noqa: N806
+    Np = (N+1)*(N+2)*(N+3)//6  # noqa: N806
+    Nfp = (N+1)*(N+2)//2  # noqa: N806
+    Nfaces = 4  # noqa: N806
 
-    K = 10000  # noqa
+    K = 10000  # noqa: N806
 
     knl = lp.make_kernel(
             [
diff --git a/test/test_from_loopy_import_star.py b/test/test_from_loopy_import_star.py
index 4f339ef96e562ba2fc5ed49236e6c6092df71e95..4ae83a3f7173135adca7d0ac803c944d1e52fd7c 100644
--- a/test/test_from_loopy_import_star.py
+++ b/test/test_from_loopy_import_star.py
@@ -1 +1 @@
-from loopy import *  # noqa
+from loopy import *  # noqa: F403
diff --git a/test/test_fusion.py b/test/test_fusion.py
index 715de89c55f510597f2875a83521181a4aefea2d..26ae7ff33e96cb42565df681475f3310d9ed303f 100644
--- a/test/test_fusion.py
+++ b/test/test_fusion.py
@@ -24,8 +24,8 @@ THE SOFTWARE.
 import numpy as np
 
 import pyopencl as cl
-from pyopencl.tools import (
-    pytest_generate_tests_for_pyopencl as pytest_generate_tests,  # noqa
+from pyopencl.tools import (  # noqa: F401
+    pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 
 import loopy as lp
diff --git a/test/test_linalg.py b/test/test_linalg.py
index ebd2e96bdfdf803ec68cdf72d0118db5c30f0493..b09b3fb6288fec7dca3b2caf73754fe2f44758f3 100644
--- a/test/test_linalg.py
+++ b/test/test_linalg.py
@@ -28,13 +28,14 @@ import numpy as np
 import pytest
 
 import pyopencl as cl
-import pyopencl.array as cl_array  # noqa: F401
-import pyopencl.cltypes as cltypes
-from pyopencl.tools import (  # noqa
+import pyopencl.array
+import pyopencl.cltypes
+from pyopencl.tools import (  # noqa: F401
     pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 
 import loopy as lp
+from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
 
 
 DEBUG_PREAMBLE = r"""
@@ -62,9 +63,6 @@ def check_float4(result, ref_result):
                 ref_result[comp], result[comp], rtol=1e-3, atol=1e-3), None
 
 
-from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
-
-
 def test_axpy(ctx_factory):
     logging.basicConfig(level="INFO")
     ctx = ctx_factory()
@@ -653,8 +651,8 @@ def test_small_batched_matvec(ctx_factory):
 
     order = "C"
 
-    K = 9997  # noqa
-    Np = 36  # noqa
+    K = 9997  # noqa: N806
+    Np = 36  # noqa: N806
 
     knl = lp.make_kernel(
             "{[i,j,k]: 0<=k<K and 0<= i,j < %d}" % Np,
diff --git a/test/test_loopy.py b/test/test_loopy.py
index 83440034105cc1383c0cdc79ee49b7324bcecc04..4983d8df499d6a3d73fa73734191153197a7aa77 100644
--- a/test/test_loopy.py
+++ b/test/test_loopy.py
@@ -85,8 +85,6 @@ def test_globals_decl_once_with_multi_subprogram(ctx_factory):
 
 
 def test_complicated_subst(ctx_factory):
-    # ctx = ctx_factory()
-
     knl = lp.make_kernel(
             "{[i]: 0<=i<n}",
             """
@@ -2199,7 +2197,7 @@ def test_nosync_option_parsing():
     assert "id=insn1, no_sync_with=insn1@any" in kernel_str
     assert "id=insn2, no_sync_with=insn1@any:insn2@any" in kernel_str
     assert "id=insn3, no_sync_with=insn1@local:insn2@global:insn3@any" in kernel_str
-    assert "id=insn4, no_sync_with=insn1@local:insn2@local:insn3@local:insn5@local" in kernel_str  # noqa
+    assert "id=insn4, no_sync_with=insn1@local:insn2@local:insn3@local:insn5@local" in kernel_str  # noqa: E501
     assert "id=insn5, no_sync_with=insn1@any" in kernel_str
 
 
diff --git a/test/test_misc.py b/test/test_misc.py
index cee8431c32fe88c2a63a0ac07702d3541014c834..184b720b683f7c3bb60e015531167918f955780e 100644
--- a/test/test_misc.py
+++ b/test/test_misc.py
@@ -249,7 +249,7 @@ def test_lazily_unpickling_list_eq_and_persistent_hashing():
     # }}}
 
 
-def test_Optional():  # noqa
+def test_optional():
     from loopy import Optional
 
     # {{{ test API
diff --git a/test/test_numa_diff.py b/test/test_numa_diff.py
index 92020b73abca57c74840050a667b29d89ca27c68..0bc5981822110e5f3caa5a6970cd38cbf2c2ab85 100644
--- a/test/test_numa_diff.py
+++ b/test/test_numa_diff.py
@@ -1,6 +1,5 @@
 """gNUMA differentiation kernel, wrapped up as a test."""
 
-
 __copyright__ = "Copyright (C) 2015 Andreas Kloeckner, Lucas Wilcox"
 
 __license__ = """
@@ -51,7 +50,7 @@ from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
 @pytest.mark.parametrize("ilp_multiple", [1, 2])
 @pytest.mark.parametrize("Nq", [7])
 @pytest.mark.parametrize("opt_level", [11])
-def test_gnuma_horiz_kernel(ctx_factory, ilp_multiple, Nq, opt_level):  # noqa
+def test_gnuma_horiz_kernel(ctx_factory, ilp_multiple, Nq, opt_level):  # noqa: N803
     pytest.importorskip("fparser")
     ctx = ctx_factory()
 
diff --git a/test/test_sem_reagan.py b/test/test_sem_reagan.py
index 7969795bf7de4e4605e1f4cd210fe3de6b3de061..602549a6823e812b9cef7aed0954585ecad331a5 100644
--- a/test/test_sem_reagan.py
+++ b/test/test_sem_reagan.py
@@ -20,16 +20,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
+import logging
 
 import numpy as np
 
-import pyopencl as cl  # noqa
-from pyopencl.tools import (  # noqa
+import pyopencl as cl  # noqa: F401
+from pyopencl.tools import (  # noqa: F401
     pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 
 import loopy as lp
-from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
+from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
+
+
+logger = logging.getLogger(__name__)
 
 
 def test_tim2d(ctx_factory):
@@ -40,7 +44,7 @@ def test_tim2d(ctx_factory):
     n = 8
 
     from pymbolic import var
-    K_sym = var("K")  # noqa
+    K_sym = var("K")  # noqa: N806
 
     field_shape = (K_sym, n, n)
 
@@ -103,7 +107,7 @@ def test_tim2d(ctx_factory):
         return knl
 
     for variant in [variant_orig]:
-        K = 1000  # noqa
+        K = 1000  # noqa: N806
         lp.auto_test_vs_ref(seq_knl, ctx, variant(knl),
                 op_count=[K*(n*n*n*2*2 + n*n*2*3 + n**3 * 2*2)/1e9],
                 op_label=["GFlops"],
diff --git a/test/test_split_iname_slabs.py b/test/test_split_iname_slabs.py
index 4b9e74af56a242fc2015da241478d4dc82b427bd..e9f0370caa7377478cbc5226cfa0a506acc762bd 100644
--- a/test/test_split_iname_slabs.py
+++ b/test/test_split_iname_slabs.py
@@ -19,17 +19,23 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
+
+import logging
+
 import numpy as np
 import pytest
 
 import pyopencl as cl
 import pyopencl.array as clarray
-from pyopencl.tools import (
-    pytest_generate_tests_for_pyopencl as pytest_generate_tests,  # noqa
+from pyopencl.tools import (  # noqa: F401
+    pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 
 import loopy as lp
-from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
+from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
+
+
+logger = logging.getLogger(__name__)
 
 
 @pytest.fixture
diff --git a/test/test_statistics.py b/test/test_statistics.py
index afb657ea1dc3777a175bf22f6a0353c7f83b4930..adaffcbec1c5f87bca0c23a1024a194ce91d6275 100644
--- a/test/test_statistics.py
+++ b/test/test_statistics.py
@@ -20,12 +20,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-import sys
+import logging
 
 import numpy as np
 
 from pymbolic.primitives import Variable
-from pyopencl.tools import (  # noqa
+from pyopencl.tools import (  # noqa: F401
     pytest_generate_tests_for_pyopencl as pytest_generate_tests,
 )
 from pytools import div_ceil
@@ -33,9 +33,11 @@ from pytools import div_ceil
 import loopy as lp
 from loopy.statistics import CountGranularity as CG
 from loopy.types import to_loopy_type
-from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa
+from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
 
 
+logger = logging.getLogger(__name__)
+
 SGS = 32  # Subgroup size
 
 
diff --git a/test/test_target.py b/test/test_target.py
index b4cb509de72ad1d99c067c77699d6ca04a7c6063..b0cb5e73c6484343ae77e94b0dbb9ca5f6e25ee8 100644
--- a/test/test_target.py
+++ b/test/test_target.py
@@ -107,18 +107,19 @@ def test_cuda_target():
 
 def test_generate_c_snippet():
     from pymbolic import var
-    I = var("I")  # noqa
+
+    I = var("I")  # noqa: N806,E741
     f = var("f")
     df = var("df")
     q_v = var("q_v")
-    eN = var("eN")  # noqa
     k = var("k")
     u = var("u")
 
     from functools import partial
+
     l_sum = partial(lp.Reduction, "sum", allow_simultaneous=True)
 
-    Instr = lp.Assignment  # noqa
+    Instr = lp.Assignment  # noqa: N806
 
     knl = lp.make_kernel(
         "{[I, k]: 0<=I<nSpace and 0<=k<nQuad}",