diff --git a/loopy/target/c/compyte b/loopy/target/c/compyte
index 276478e5b357618a4464817f2263c0d41515d425..d1f993daecc03947d9e6e3e60d2a5145ecbf3786 160000
--- a/loopy/target/c/compyte
+++ b/loopy/target/c/compyte
@@ -1 +1 @@
-Subproject commit 276478e5b357618a4464817f2263c0d41515d425
+Subproject commit d1f993daecc03947d9e6e3e60d2a5145ecbf3786
diff --git a/test/test_expression.py b/test/test_expression.py
index dd8c74105a703c2ab63eb44b44c3d2ff05b0afac..03ac0d7873aa6d8b2aaf969bb4acdd4526bffe1e 100644
--- a/test/test_expression.py
+++ b/test/test_expression.py
@@ -344,8 +344,9 @@ def test_fuzz_expression_code_gen(ctx_factory, expr_type, random_seed, target):
     print(knl)
 
     if target == lp.PyOpenCLTarget:
+        cl_ctx = ctx_factory()
         knl = lp.set_options(knl, "write_cl")
-        evt, lp_values = knl(cl.CommandQueue(ctx_factory()), out_host=True)
+        evt, lp_values = knl(cl.CommandQueue(cl_ctx), out_host=True)
     elif target == lp.ExecutableCTarget:
         evt, lp_values = knl()
     else:
@@ -517,7 +518,8 @@ def test_complex_support(ctx_factory, target):
 
     if target == lp.PyOpenCLTarget:
         knl = lp.set_options(knl, "write_cl")
-        evt, out = knl(cl.CommandQueue(ctx_factory()), **kwargs)
+        cl_ctx = ctx_factory()
+        evt, out = knl(cl.CommandQueue(cl_ctx), **kwargs)
     elif target == lp.ExecutableCTarget:
         evt, out = knl(**kwargs)
     else:
diff --git a/test/test_target.py b/test/test_target.py
index 7f691b3e4d4b186bd0aa9ff28249a085e26bed28..bda6b78eaf72e23ff5c192d74e937c5ca6918812 100644
--- a/test/test_target.py
+++ b/test/test_target.py
@@ -416,7 +416,8 @@ def test_opencl_support_for_bool(ctx_factory):
         """,
         [lp.GlobalArg("y", dtype=np.bool8, shape=lp.auto)])
 
-    evt, (out, ) = knl(cl.CommandQueue(ctx_factory()))
+    cl_ctx = ctx_factory()
+    evt, (out, ) = knl(cl.CommandQueue(cl_ctx))
     out = out.get()
 
     np.testing.assert_equal(out, np.tile(np.array([0, 1], dtype=np.bool8), 5))