diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0668317425af65928b1c20c9a784053181f9e072..0983d91b9859ab398640717339986836e040e1c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@ build:
     - cmake --build . -- -j4
     - UBSAN_OPTIONS=print_stacktrace=1
       LSAN_OPTIONS=verbosity=1:log_threads=1
-      ASAN_OPTIONS=detect_leaks=1:detect_stack_use_after_return=1 ctest -V -O test.log
+      ASAN_OPTIONS=detect_leaks=0:detect_stack_use_after_return=1 ctest -V -O test.log
   artifacts:
     expire_in: 1 week
     paths:
diff --git a/CMakeModules/CorsikaUtilities.cmake b/CMakeModules/CorsikaUtilities.cmake
index 3d78907f342523574d38918bc876fe34855cdc10..abd7bfcde005a3354a20f59c551198e12ecbd154 100644
--- a/CMakeModules/CorsikaUtilities.cmake
+++ b/CMakeModules/CorsikaUtilities.cmake
@@ -103,12 +103,9 @@ function (CORSIKA_ADD_TEST name)
   file (MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/test_outputs/)
   add_test (NAME ${name} COMMAND ${name} -o ${PROJECT_BINARY_DIR}/test_outputs/junit-${name}.xml -r junit)
   # set(sanitize "address,implicit-integer-truncation,implicit-conversion,integer,alignment,bool,builtin,bounds,enum,float-cast-overflow,function,pointer-overflow,return,shift,shift-base,shift-exponent,unreachable,vla-bound,vptr")
-  set(sanitize "address,undefined")
-  ### leak sanitizer disabled for now, doesn't work on buildbot
-  # if(NOT CMAKE_CXX_COMPILER_ID STREQUAL AppleClang)
-  #   # Apple has some security measures which interfere with the leak sanitizer, so we can't use it on OSX
-  #   set(sanitize "leak,${sanitize}")
-  # endif()
+  # standard options not ideal, because we want to allow divide-by-zero for floats,
+  # but gcc-7 doesn't support all the detailed flags
+  set(sanitize "address,undefined") 
   target_compile_options(${name} PRIVATE -fno-omit-frame-pointer -fsanitize=${sanitize} -fno-sanitize-recover=all)
   set_target_properties(${name} PROPERTIES LINK_FLAGS "-fsanitize=${sanitize}")