diff --git a/test/test_loopy.py b/test/test_loopy.py
index b78c754bdfe04b6bc18b3059b490e41ab5df1825..e624ed346cd696bf18a116e9373f8e765dafdc9a 100644
--- a/test/test_loopy.py
+++ b/test/test_loopy.py
@@ -2462,16 +2462,9 @@ def test_barrier_in_overridden_get_grid_size_expanded_kernel():
     vecsize = 16
     knl = lp.split_iname(knl, 'i', vecsize, inner_tag='l.0')
 
-    # artifically expand via overridden_get_grid_sizes_for_insn_ids
-    class GridOverride(object):
-        def __init__(self, clean, vecsize=vecsize):
-            self.clean = clean
-            self.vecsize = vecsize
-
-        def __call__(self, insn_ids, ignore_auto=True):
-            gsize, _ = self.clean.get_grid_sizes_for_insn_ids(insn_ids, ignore_auto)
-            return gsize, (self.vecsize,)
+    from testlib import GridOverride
 
+    # artifically expand via overridden_get_grid_sizes_for_insn_ids
     knl = knl.copy(overridden_get_grid_sizes_for_insn_ids=GridOverride(
         knl.copy(), vecsize))
     # make sure we can generate the code
diff --git a/test/testlib.py b/test/testlib.py
index 3fae05a38ad0f0c414f42a182e36ed26c5b50da5..73de4199d31736230026eb7f2eb7939a93806369 100644
--- a/test/testlib.py
+++ b/test/testlib.py
@@ -1,6 +1,20 @@
 import loopy as lp
 
 
+# {{{ test_barrier_in_overridden_get_grid_size_expanded_kernel
+
+class GridOverride(object):
+    def __init__(self, clean, vecsize):
+        self.clean = clean
+        self.vecsize = vecsize
+
+    def __call__(self, insn_ids, ignore_auto=True):
+        gsize, _ = self.clean.get_grid_sizes_for_insn_ids(insn_ids, ignore_auto)
+        return gsize, (self.vecsize,)
+
+# }}}
+
+
 # {{{ test_preamble_with_separate_temporaries
 
 class SeparateTemporariesPreambleTestHelper:
@@ -99,3 +113,5 @@ class SeparateTemporariesPreambleTestHelper:
         yield (desc, '\n'.join([str(decl), code]))
 
 # }}}
+
+# vim: foldmethod=marker