diff --git a/test/test_apps.py b/test/test_apps.py
index 7c3d743c4bdf49c6424e962a08bab0c396f8add7..aec54f661a8a12712f15e7dcf44593ef0a9f87a6 100644
--- a/test/test_apps.py
+++ b/test/test_apps.py
@@ -74,7 +74,7 @@ def test_convolution(ctx_factory):
             "..."
             ],
         assumptions="f_w>=1 and im_w, im_h >= 2*f_w+1 and nfeats>=1 and nimgs>=0",
-        flags="annotate_inames",
+        options="annotate_inames",
         defines=dict(ncolors=3))
 
     f_w = 3
@@ -102,8 +102,8 @@ def test_convolution(ctx_factory):
         return knl
 
     for variant in [
-            variant_0,
-            variant_1,
+            #variant_0,
+            #variant_1,
             variant_2
             ]:
         lp.auto_test_vs_ref(ref_knl, ctx, variant(knl),
diff --git a/test/test_linalg.py b/test/test_linalg.py
index e3cae8557a2266bb7b27adb4d6148ed2cda32063..b7a1e059cb4499fe136f962b5d5fdcd539fc05f1 100644
--- a/test/test_linalg.py
+++ b/test/test_linalg.py
@@ -285,7 +285,7 @@ def test_rank_one(ctx_factory):
     def variant_1(knl):
         knl = lp.add_prefetch(knl, "a")
         knl = lp.add_prefetch(knl, "b")
-        knl = knl.set_loop_priority(knl, ["i", "j"])
+        knl = lp.set_loop_priority(knl, ["i", "j"])
         return knl
 
     def variant_2(knl):
@@ -294,7 +294,6 @@ def test_rank_one(ctx_factory):
         knl = lp.split_iname(knl, "j", 16,
                 outer_tag="g.1", inner_tag="l.1")
 
-        knl = knl.set_loop_priority(knl, ["i", "j"])
         knl = lp.add_prefetch(knl, "a")
         knl = lp.add_prefetch(knl, "b")
         return knl
@@ -331,8 +330,7 @@ def test_rank_one(ctx_factory):
 
     seq_knl = knl
 
-    #for variant in [variant_1, variant_2, variant_3, variant_4]:
-    for variant in [variant_4]:
+    for variant in [variant_1, variant_2, variant_3, variant_4]:
         lp.auto_test_vs_ref(seq_knl, ctx, variant(knl),
                 op_count=[np.dtype(dtype).itemsize*n**2/1e9], op_label=["GBytes"],
                 parameters={"n": n})