diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7f98e2991f29f36c3b900196ae0081e4f71020d..c5fb1b36298c09a1bcb59bcdf383a6d85520a2b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,23 +6,20 @@ stages:
 
 # -------------------- Code Quality ---------------------------------------------------------------------
 
-.qa-base:
+.python-qa:
   stage: "Code Quality"
   image: i10git.cs.fau.de:5005/pycodegen/pycodegen/nox:alpine
   needs: []
-  except:
-    variables:
-      - $ENABLE_NIGHTLY_BUILDS
   tags:
     - docker
 
 lint:
-  extends: .qa-base
+  extends: .python-qa
   script:
     - nox -s lint
 
 typecheck:
-  extends: .qa-base
+  extends: .python-qa
   script:
     - nox -s typecheck
 
diff --git a/tests/BasicLbmScenarios/CMakeLists.txt b/tests/BasicLbmScenarios/CMakeLists.txt
index ea261feb06628c75973509c7e4a229ddf09bea91..58dfde5a5c2de2ce2901c0efd94b4eefcf11104e 100644
--- a/tests/BasicLbmScenarios/CMakeLists.txt
+++ b/tests/BasicLbmScenarios/CMakeLists.txt
@@ -16,11 +16,6 @@ endforeach()
 
 
 if( $CACHE{WALBERLA_BUILD_WITH_CUDA} )
-    find_package( CUDAToolkit REQUIRED )
-    
-    #   Workaround: CUDA headers are included in core/timing
-    target_link_libraries( TestBasicLbmScenariosCPU PRIVATE CUDA::cudart )
-
     set( _codegen_suffixes hpp cu )
 
     add_executable( TestBasicLbmScenariosCUDA TestBasicLbmScenarios.cpp )
diff --git a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
index 74a49535f48afd1cf4fc4aef051294c3c78f3568..974e5f28b914698aef91aa6c73604447616be0c9 100644
--- a/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
+++ b/tests/BasicLbmScenarios/TestBasicLbmScenarios.cpp
@@ -63,9 +63,7 @@ void fullyPeriodic(mpi::Environment& env)
 void mirroredHalfChannel(mpi::Environment& env)
 {
    size_t zCells{ 64 };
-   /**
-    * Need one more cell in z-direction for the free-slip boundary to be on the inner layer
-    */
+
    SimDomain dom{ SimDomainBuilder{
       .blocks = { 1, 1, 1 }, .cellsPerBlock = { 4, 4, zCells }, .periodic = { true, true, false } }
                      .build() };
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 96520fa8d321fa15cef76d2cff5c2e90a566e43b..34ada831690e5207e351f521880853cdb84a8b7c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -35,6 +35,13 @@ if( $CACHE{WALBERLA_BUILD_WITH_HIP})
     target_link_libraries( walberla_gpu PUBLIC hip::host )
 endif()
 
+if( $CACHE{WALBERLA_BUILD_WITH_CUDA})
+    find_package( CUDAToolkit REQUIRED )
+
+    target_link_libraries( walberla_core PUBLIC CUDA::cudart )
+    target_link_libraries( walberla_gpu PUBLIC CUDA::cudart )
+endif()
+
 add_subdirectory(${CMAKE_SOURCE_DIR}/.. ${CMAKE_BINARY_DIR}/sfg-walberla)
 
 #   Test Directories