diff --git a/src/lbmpy/lbstep.py b/src/lbmpy/lbstep.py
index 949b97a3265d8fb0c1fc48726a0c46beb19e8f47..e7bb15b15cd7be50b1e5d662c93b6e2d58fec8e5 100644
--- a/src/lbmpy/lbstep.py
+++ b/src/lbmpy/lbstep.py
@@ -47,8 +47,10 @@ class LatticeBoltzmannStep:
         if config is not None:
             if IS_PYSTENCILS_2:
                 target = config.get_target()
+                is_gpu = target.is_gpu()
             else:
                 target = config.target
+                is_gpu = target == Target.GPU
         else:
             target = optimization.get('target', Target.CPU)
 
@@ -91,7 +93,7 @@ class LatticeBoltzmannStep:
         self.density_data_name = name + "_density" if density_data_name is None else density_data_name
         self.density_data_index = density_data_index
 
-        self._gpu = target == Target.GPU
+        self._gpu = is_gpu
         layout = lbm_optimisation.field_layout
 
         alignment = False
diff --git a/tests/test_cpu_gpu_equivalence.py b/tests/test_cpu_gpu_equivalence.py
index ae71ca174aa3e29ca7d9bcab3c7927ffc2707bfe..49b347fda23fe6f6bd0fc1e22de69e4b89a45032 100644
--- a/tests/test_cpu_gpu_equivalence.py
+++ b/tests/test_cpu_gpu_equivalence.py
@@ -53,7 +53,9 @@ def test_force_driven_channel_short(scenario):
         config = CreateKernelConfig(gpu_indexing_params={'block_size': block_size})
     else:
         if IS_PYSTENCILS_2:
-            pytest.xfail("Line indexing not available yet")
-        config = CreateKernelConfig(gpu_indexing='line')
+            config = CreateKernelConfig()
+            config.gpu.indexing_scheme = "blockwise4d"
+        else:
+            config = CreateKernelConfig(gpu_indexing='line')
 
     run_equivalence_test(domain_size=ds, lbm_config=lbm_config, lbm_opt=lbm_opt, base_config=config)