diff --git a/test/tree_dgsem_3d/advection_basic.jl b/test/tree_dgsem_3d/advection_basic.jl
index 69a3a73..5a4ff92 100644
--- a/test/tree_dgsem_3d/advection_basic.jl
+++ b/test/tree_dgsem_3d/advection_basic.jl
@@ -23,7 +23,7 @@ include("../test_macros.jl")
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition_convergence_test,
                                                solver)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -43,7 +43,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/advection_mortar.jl b/test/tree_dgsem_3d/advection_mortar.jl
index c8bacbf..5456dd0 100644
--- a/test/tree_dgsem_3d/advection_mortar.jl
+++ b/test/tree_dgsem_3d/advection_mortar.jl
@@ -26,7 +26,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 5.0)
+    tspan = tspan_gpu = (0.0, 5.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -46,7 +46,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/euler_convergence.jl b/test/tree_dgsem_3d/euler_convergence.jl
index 66f0cd7..e02905a 100644
--- a/test/tree_dgsem_3d/euler_convergence.jl
+++ b/test/tree_dgsem_3d/euler_convergence.jl
@@ -24,7 +24,7 @@ include("../test_macros.jl")
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver,
                                                source_terms = source_terms_eoc_test_euler)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -44,7 +44,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/euler_ec.jl b/test/tree_dgsem_3d/euler_ec.jl
index 3f5e981..590e132 100644
--- a/test/tree_dgsem_3d/euler_ec.jl
+++ b/test/tree_dgsem_3d/euler_ec.jl
@@ -23,7 +23,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 0.4)
+    tspan = tspan_gpu = (0.0, 0.4)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -43,7 +43,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/euler_mortar.jl b/test/tree_dgsem_3d/euler_mortar.jl
index 95189ea..2a99985 100644
--- a/test/tree_dgsem_3d/euler_mortar.jl
+++ b/test/tree_dgsem_3d/euler_mortar.jl
@@ -25,7 +25,7 @@ include("../test_macros.jl")
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver,
                                                source_terms = source_terms_convergence_test)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -45,7 +45,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/euler_shock.jl b/test/tree_dgsem_3d/euler_shock.jl
index 8444e47..9621638 100644
--- a/test/tree_dgsem_3d/euler_shock.jl
+++ b/test/tree_dgsem_3d/euler_shock.jl
@@ -34,7 +34,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 0.4)
+    tspan = tspan_gpu = (0.0, 0.4)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -54,7 +54,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/euler_source_terms.jl b/test/tree_dgsem_3d/euler_source_terms.jl
index 817c1e1..82b84c0 100644
--- a/test/tree_dgsem_3d/euler_source_terms.jl
+++ b/test/tree_dgsem_3d/euler_source_terms.jl
@@ -24,7 +24,7 @@ include("../test_macros.jl")
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver,
                                                source_terms = source_terms_convergence_test)
 
-    tspan = (0.0, 5.0)
+    tspan = tspan_gpu = (0.0, 5.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -44,7 +44,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl
index 74b9594..650c095 100644
--- a/test/tree_dgsem_3d/hypdiff_nonperiodic.jl
+++ b/test/tree_dgsem_3d/hypdiff_nonperiodic.jl
@@ -32,7 +32,7 @@ include("../test_macros.jl")
                                                source_terms = source_terms_poisson_nonperiodic,
                                                boundary_conditions = boundary_conditions)
 
-    tspan = (0.0, 5.0)
+    tspan = tspan_gpu = (0.0, 5.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -52,7 +52,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/mhd_alfven_wave.jl b/test/tree_dgsem_3d/mhd_alfven_wave.jl
index 97e33a1..cb95eaa 100644
--- a/test/tree_dgsem_3d/mhd_alfven_wave.jl
+++ b/test/tree_dgsem_3d/mhd_alfven_wave.jl
@@ -24,7 +24,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -44,7 +44,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl
index 7c2d253..29e8ce9 100644
--- a/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl
+++ b/test/tree_dgsem_3d/mhd_alfven_wave_mortar.jl
@@ -28,7 +28,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -48,7 +48,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/mhd_ec.jl b/test/tree_dgsem_3d/mhd_ec.jl
index e1bf1e8..adf7686 100644
--- a/test/tree_dgsem_3d/mhd_ec.jl
+++ b/test/tree_dgsem_3d/mhd_ec.jl
@@ -24,7 +24,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 0.4)
+    tspan = tspan_gpu = (0.0, 0.4)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -44,7 +44,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)
 
diff --git a/test/tree_dgsem_3d/mhd_shock.jl b/test/tree_dgsem_3d/mhd_shock.jl
index 9cc4313..6042c25 100644
--- a/test/tree_dgsem_3d/mhd_shock.jl
+++ b/test/tree_dgsem_3d/mhd_shock.jl
@@ -35,7 +35,7 @@ include("../test_macros.jl")
     semi = SemidiscretizationHyperbolic(mesh, equations, initial_condition, solver)
     semi_gpu = SemidiscretizationHyperbolicGPU(mesh, equations, initial_condition, solver)
 
-    tspan = (0.0, 1.0)
+    tspan = tspan_gpu = (0.0, 1.0)
     t = t_gpu = 0.0
 
     # Semi on CPU
@@ -55,7 +55,7 @@ include("../test_macros.jl")
     du = Trixi.wrap_array(du_ode, mesh, equations, solver, cache)
 
     # ODE on GPU
-    ode_gpu = semidiscretizeGPU(semi_gpu, tspan)
+    ode_gpu = semidiscretizeGPU(semi_gpu, tspan_gpu)
     u_gpu = copy(ode_gpu.u0)
     du_gpu = similar(u_gpu)