diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
index 026d0f98ab9..f0143032cd1 100755
--- a/src/scripts/ci_build.py
+++ b/src/scripts/ci_build.py
@@ -112,7 +112,9 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache,
 
     make_prefix = []
     test_prefix = []
-    test_cmd = [os.path.join(build_dir, 'botan-test'), '--data-dir=%s' % os.path.join(root_dir, 'src', 'tests', 'data'), '--run-memory-intensive-tests']
+    test_cmd = [os.path.join(build_dir, 'botan-test'),
+                '--data-dir=%s' % os.path.join(root_dir, 'src', 'tests', 'data'),
+                '--run-memory-intensive-tests']
 
     # generate JUnit test report
     if test_results_dir:
@@ -171,10 +173,7 @@ def sanitize_kv(some_string):
         flags += ['--ldflags=-static']
 
     if target == 'coverage':
-        flags += ['--with-coverage-info']
-
-    if target in ['coverage']:
-        flags += ['--with-debug-info']
+        flags += ['--with-coverage-info', '--with-debug-info']
 
     if target in ['coverage', 'sanitizer', 'fuzzers']:
         flags += ['--terminate-on-asserts']
@@ -182,8 +181,6 @@ def sanitize_kv(some_string):
     if target == 'valgrind':
         flags += ['--with-valgrind']
         test_prefix = ['valgrind', '--error-exitcode=9', '-v', '--leak-check=full', '--show-reachable=yes']
-        # valgrind is single threaded anyway
-        test_cmd += ['--test-threads=1']
         # valgrind is slow
         slow_tests = [
             'cryptobox', 'dh_invalid', 'dh_kat', 'dh_keygen',
@@ -208,13 +205,13 @@ def sanitize_kv(some_string):
 
     if target in ['fuzzers', 'sanitizer']:
         flags += ['--with-debug-asserts']
-
         if target_cc in ['clang', 'gcc']:
             flags += ['--enable-sanitizers=address,undefined']
         else:
-            flags += ['--enable-sanitizers=address']
+            flags += ['--enable-sanitizers=address', '--with-debug-info']
 
     if target in ['valgrind', 'sanitizer', 'fuzzers']:
+        test_cmd += ['--test-threads=1']
         flags += ['--disable-modules=locking_allocator']
 
     if target == 'emscripten':