diff --git a/test/runtests.jl b/test/runtests.jl
index 61d41554..08cb6874 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -75,13 +75,15 @@ const TRIXI_NTHREADS = clamp(Sys.CPU_THREADS, 2, 3)
         end
     end
 
-    @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_3d"
+    @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_3d" ||
+             TRIXI_TEST == "upstream"
         @testset verbose=true showtiming=true "Spherical SWE Cartesian tests" begin
             include("test_3d_shallow_water.jl")
         end
     end
 
-    @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_2d_covariant"
+    @time if TRIXI_TEST == "all" || TRIXI_TEST == "shallow_water_2d_covariant" ||
+             TRIXI_TEST == "upstream"
         @testset verbose=true showtiming=true "Spherical SWE covariant tests" begin
             include("test_2d_shallow_water_covariant.jl")
         end
@@ -93,7 +95,8 @@ const TRIXI_NTHREADS = clamp(Sys.CPU_THREADS, 2, 3)
         end
     end
 
-    @time if TRIXI_TEST == "all" || TRIXI_TEST == "euler_potential_temperature_2d"
+    @time if TRIXI_TEST == "all" || TRIXI_TEST == "euler_potential_temperature_2d" ||
+             TRIXI_TEST == "upstream"
         @testset verbose=true showtiming=true "Euler potential temperature 2D tests" begin
             include("test_2d_potential_temperature.jl")
         end