diff --git a/.cirrus.yml b/.cirrus.yml
index dc2dcd8584..65c2d9815e 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -5,7 +5,7 @@ container:
   # https://cirrus-ci.org/faq/#are-there-any-limits
   # Each project has 16 CPU in total, assign 2 to each container, so that 8 tasks run in parallel
   cpu: 2
-  memory: 6G  # https://cirrus-ci.org/guide/linux/#linux-containers
+  memory: 8G  # Set to 8GB to avoid OOM. https://cirrus-ci.org/guide/linux/#linux-containers
 env:
   PACKAGE_MANAGER_INSTALL : "apt-get update && apt-get install -y"
   MAKEJOBS: "-j4"
@@ -51,3 +51,11 @@ task:
     image: ubuntu:focal
   env:
     FILE_ENV: "./ci/test/00_setup_env_native_asan.sh"
+
+task:
+  name: 'x86_64 Linux  [GOAL: install]  [focal]  [no depends, only system libs, fuzzers under valgrind]'
+  << : *GLOBAL_TASK_TEMPLATE
+  container:
+    image: ubuntu:focal
+  env:
+    FILE_ENV: "./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
diff --git a/.travis.yml b/.travis.yml
index 42f9601ebb..45c89220f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -215,11 +215,6 @@ after_success:
       env: >-
         FILE_ENV="./ci/test/00_setup_env_native_fuzz.sh"
 
-    - stage: test
-      name: 'x86_64 Linux  [GOAL: install]  [focal]  [no depends, only system libs, fuzzers under valgrind]'
-      env: >-
-        FILE_ENV="./ci/test/00_setup_env_native_fuzz_with_valgrind.sh"
-
     - stage: test
       name: 'x86_64 Linux [GOAL: install]  [focal]  [multiprocess]'
       env: >-