diff --git a/codegen-requirements.txt b/codegen-requirements.txt
index 4ff585b6384fbd3d2af41a90999135f29d8e5d0f..da4b7e021323e7dde875af3feeb5c7f002076633 100644
--- a/codegen-requirements.txt
+++ b/codegen-requirements.txt
@@ -5,4 +5,4 @@ git+https://i10git.cs.fau.de/pycodegen/pystencils.git@v2.0-dev
 git+https://i10git.cs.fau.de/pycodegen/lbmpy.git@fhennig/pystencils2.0-compat
 
 # pystencils-sfg: master
-git+https://i10git.cs.fau.de/pycodegen/pystencils-sfg.git@fhennig/devel
+git+https://i10git.cs.fau.de/pycodegen/pystencils-sfg.git@fhennig/postprocessing-fixes
diff --git a/tests/BasicLbmScenarios/CMakeLists.txt b/tests/BasicLbmScenarios/CMakeLists.txt
index 42a1ced66263d90e5f4872c95ace55e8566538ec..2501346469d9cb32056fad204f09d82141434aab 100644
--- a/tests/BasicLbmScenarios/CMakeLists.txt
+++ b/tests/BasicLbmScenarios/CMakeLists.txt
@@ -16,7 +16,7 @@ endforeach()
 
 
 if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
-    find_package( CUDAToolkit )
+    find_package( CUDAToolkit REQUIRED )
     
     #   Workaround: CUDA headers are included in core/timing
     target_link_libraries( TestBasicLbmScenariosCPU PRIVATE CUDA::cudart )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 1d719cbfa8741eb2e817ca3b69bb81497db38e1b..2ba5b0beec35b70d2c9c1b5d7a0a98106a2edc91 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,5 +1,13 @@
 cmake_minimum_required( VERSION 3.24 )
-project( sfg-walberla-testsuite LANGUAGES CXX CUDA )
+project( sfg-walberla-testsuite LANGUAGES CXX )
+
+if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
+    enable_language( CUDA )
+endif()
+
+if( $CACHE{WALBERLA_BUILD_WITH_HIP} )
+    enable_language( HIP )
+endif()
 
 set(WALBERLA_BUILD_TESTS OFF CACHE BOOL "")
 set(WALBERLA_BUILD_BENCHMARKS OFF CACHE BOOL "")
diff --git a/tests/CMakePresets.json b/tests/CMakePresets.json
index a064ccfbfb88e5d4aa225185bb26a9cdf4c8fe3c..d14bb51eca049401b8bf6d0a1924518ef443d0b8 100644
--- a/tests/CMakePresets.json
+++ b/tests/CMakePresets.json
@@ -25,6 +25,20 @@
                 "WALBERLA_BUILD_WITH_CUDA": true,
                 "CMAKE_CUDA_ARCHITECTURES": "native"
             }
+        },
+        {
+            "name": "testsuite-dbg-hip",
+            "binaryDir": "${sourceDir}/build/${presetName}",
+            "generator": "Ninja",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "WALBERLA_BUILD_TESTS": false,
+                "WALBERLA_BUILD_WITH_HIP": true
+            },
+            "environment": {
+                "CC": "hipcc",
+                "CXX": "hipcc"
+            }
         }
     ]
 }