diff --git a/apps/benchmarks/CMakeLists.txt b/apps/benchmarks/CMakeLists.txt
index 5d392389249b53cabfa9fa9a0efcebe50ff89eda..01d57440109ea02878e19231b10a36e012d93d8c 100644
--- a/apps/benchmarks/CMakeLists.txt
+++ b/apps/benchmarks/CMakeLists.txt
@@ -14,11 +14,10 @@ add_subdirectory( PoiseuilleChannel )
 add_subdirectory( ProbeVsExtraMessage )
 add_subdirectory( SchaeferTurek )
 add_subdirectory( UniformGrid )
-if ( WALBERLA_BUILD_WITH_CODEGEN AND NOT WALBERLA_BUILD_WITH_CUDA )
+if ( WALBERLA_BUILD_WITH_CODEGEN )
 add_subdirectory( UniformGridGenerated )
 add_subdirectory( PhaseFieldAllenCahn )
 endif()
-if ( WALBERLA_BUILD_WITH_CUDA )
+if ( WALBERLA_BUILD_WITH_CODEGEN AND WALBERLA_BUILD_WITH_CUDA )
 add_subdirectory( UniformGridGPU )
-add_subdirectory( PhaseFieldAllenCahn )
 endif()
diff --git a/tests/cuda/CMakeLists.txt b/tests/cuda/CMakeLists.txt
index fb00acf952ae0e61bce77a9839daa11bac054a17..b164640649283ab5683ee295c2d4931517aee223 100644
--- a/tests/cuda/CMakeLists.txt
+++ b/tests/cuda/CMakeLists.txt
@@ -29,6 +29,10 @@ waLBerla_compile_test( FILES codegen/CodegenJacobiGPU.cpp
                        DEPENDS blockforest timeloop gui CodegenJacobiGPUGeneratedCudaJacobiKernel )
 waLBerla_execute_test( NAME CodegenJacobiGPU )
 
+waLBerla_generate_target_from_python(NAME CodegenPoissonGPUGeneratedKernel FILE codegen/CudaPoisson.py
+        OUT_FILES PoissonGPU.cu PoissonGPU.h )
+waLBerla_compile_test( FILES codegen/CodegenPoissonGPU.cpp DEPENDS gui cuda timeloop CodegenPoissonGPUGeneratedKernel)
+waLBerla_execute_test( NAME CodegenPoissonGPU )
 
 # The following tests work only for CUDA enabled MPI
 waLBerla_compile_test( FILES communication/CommTest )
diff --git a/tests/cuda/codegen/CodegenPoissonGPU.cpp b/tests/cuda/codegen/CodegenPoissonGPU.cpp
index fd88bf1fb0a7749921eb48fc9b58006a05d0128d..d160f799921d28721c6428016f683e34ef20abbb 100644
--- a/tests/cuda/codegen/CodegenPoissonGPU.cpp
+++ b/tests/cuda/codegen/CodegenPoissonGPU.cpp
@@ -20,7 +20,6 @@
 
 #include "PoissonGPU.h"
 
-#include "cuda/HostFieldAllocator.h"
 #include "blockforest/Initialization.h"
 #include "blockforest/communication/UniformDirectScheme.h"
 #include "blockforest/communication/UniformBufferedScheme.h"
@@ -29,10 +28,8 @@
 #include "core/debug/TestSubsystem.h"
 #include "core/math/Constants.h"
 
-#include "cuda/HostFieldAllocator.h"
 #include "cuda/FieldCopy.h"
 #include "cuda/GPUField.h"
-#include "cuda/Kernel.h"
 #include "cuda/AddGPUFieldToStorage.h"
 #include "cuda/communication/GPUPackInfo.h"
 #include "cuda/FieldIndexing.h"
@@ -43,8 +40,6 @@
 
 #include "geometry/initializer/ScalarFieldFromGrayScaleImage.h"
 
-#include "gui/Gui.h"
-
 #include "stencil/D2Q9.h"
 
 #include "timeloop/SweepTimeloop.h"
diff --git a/tests/field/CMakeLists.txt b/tests/field/CMakeLists.txt
index 3c2cd3244fbc7e363e06d7706298e9dc0b605510..992dc42982244a84bf0f979d543dfdcd17ce54e3 100644
--- a/tests/field/CMakeLists.txt
+++ b/tests/field/CMakeLists.txt
@@ -68,10 +68,10 @@ waLBerla_generate_target_from_python(NAME CodegenJacobiCPUGeneratedJacobiKernel
 waLBerla_compile_test( FILES codegen/CodegenJacobiCPU.cpp DEPENDS gui timeloop CodegenJacobiCPUGeneratedJacobiKernel)
 waLBerla_execute_test( NAME CodegenJacobiCPU )
 
-waLBerla_generate_target_from_python(NAME CodegenPoissonGeneratedKernel FILE codegen/Poisson.py
+waLBerla_generate_target_from_python(NAME CodegenPoissonCPUGeneratedKernel FILE codegen/Poisson.py
       OUT_FILES Poisson.cpp Poisson.h )
-waLBerla_compile_test( FILES codegen/CodegenPoisson.cpp DEPENDS gui timeloop CodegenPoissonGeneratedKernel)
-waLBerla_execute_test( NAME CodegenPoisson )
+waLBerla_compile_test( FILES codegen/CodegenPoissonCPU.cpp DEPENDS gui timeloop CodegenPoissonCPUGeneratedKernel)
+waLBerla_execute_test( NAME CodegenPoissonCPU )
 
 waLBerla_generate_target_from_python(NAME CodeGenMultipleFieldSwaps FILE codegen/MultipleFieldSwaps.py
         OUT_FILES MultipleFieldSwaps.cpp MultipleFieldSwaps.h )
diff --git a/tests/field/codegen/CodegenPoisson.cpp b/tests/field/codegen/CodegenPoissonCPU.cpp
similarity index 100%
rename from tests/field/codegen/CodegenPoisson.cpp
rename to tests/field/codegen/CodegenPoissonCPU.cpp