diff --git a/boxtree/tools.py b/boxtree/tools.py
index 505fed0cb760c73e50c97a4824ddf709200f0f7b..ae623cb3081810c0da33e4870ac98db443a14064 100644
--- a/boxtree/tools.py
+++ b/boxtree/tools.py
@@ -91,8 +91,8 @@ def reverse_index_array(indices, target_size=None, result_fill_value=None,
 # {{{ particle distribution generators
 
 def make_normal_particle_array(queue, nparticles, dims, dtype, seed=15):
-    from pyopencl.clrandom import RanluxGenerator
-    rng = RanluxGenerator(queue, seed=seed)
+    from pyopencl.clrandom import PhiloxGenerator
+    rng = PhiloxGenerator(queue.context, seed=seed)
 
     return make_obj_array([
         rng.normal(queue, nparticles, dtype=dtype)
diff --git a/test/test_fmm.py b/test/test_fmm.py
index 22e1328ffd9de0a91c5ef59ea8167ce5e72e8bce..af4ce374125be006ccb846451f65a99b9dd48b7f 100644
--- a/test/test_fmm.py
+++ b/test/test_fmm.py
@@ -276,8 +276,8 @@ def test_fmm_completeness(ctx_getter, dims, nsources_req, ntargets_req,
         pytest.skip("loo.py not available, but needed for particle array "
                 "generation")
 
-    from pyopencl.clrandom import RanluxGenerator
-    rng = RanluxGenerator(queue, seed=13)
+    from pyopencl.clrandom import PhiloxGenerator
+    rng = PhiloxGenerator(queue.context, seed=12)
     if sources_have_extent:
         source_radii = 2**rng.uniform(queue, nsources, dtype=dtype,
                 a=-10, b=0)
@@ -472,8 +472,8 @@ def test_pyfmmlib_fmm(ctx_getter):
 
     trav = trav.get(queue=queue)
 
-    from pyopencl.clrandom import RanluxGenerator
-    rng = RanluxGenerator(queue, seed=20)
+    from pyopencl.clrandom import PhiloxGenerator
+    rng = PhiloxGenerator(queue.context, seed=20)
 
     weights = rng.uniform(queue, nsources, dtype=np.float64).get()
     #weights = np.ones(nsources)
diff --git a/test/test_traversal.py b/test/test_traversal.py
index d9613dc56c8538640c58e7aabf3e91b3ca53e1d3..f9424800708b9fd04758e1814698f4be9345af20 100644
--- a/test/test_traversal.py
+++ b/test/test_traversal.py
@@ -237,8 +237,8 @@ def plot_traversal(ctx_getter, do_plot=False):
         nparticles = 10**4
         dtype = np.float64
 
-        from pyopencl.clrandom import RanluxGenerator
-        rng = RanluxGenerator(queue, seed=15)
+        from pyopencl.clrandom import PhiloxGenerator
+        rng = PhiloxGenerator(queue.context, seed=15)
 
         from pytools.obj_array import make_obj_array
         particles = make_obj_array([
diff --git a/test/test_tree.py b/test/test_tree.py
index 8e5e28b2ae1b6b187b6b9b6b8e11e66f7ffb6c15..be45d91f3ebd424a01577f74a62caa0985323f74 100644
--- a/test/test_tree.py
+++ b/test/test_tree.py
@@ -415,8 +415,8 @@ def test_extent_tree(ctx_getter, dims, do_plot=False):
     targets = make_normal_particle_array(queue, ntargets, dims, dtype,
             seed=19)
 
-    from pyopencl.clrandom import RanluxGenerator
-    rng = RanluxGenerator(queue, seed=13)
+    from pyopencl.clrandom import PhiloxGenerator
+    rng = PhiloxGenerator(queue.context, seed=13)
     source_radii = 2**rng.uniform(queue, nsources, dtype=dtype,
             a=-10, b=0)
     target_radii = 2**rng.uniform(queue, ntargets, dtype=dtype,