diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5d276b263..66add357c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,6 +28,11 @@ defaults:
   - run_tests: &run_tests
       name: Tests
       command: scripts/tests.sh --junit_report test_results
+  - run_tests_valgrind:
+      <<: *run_tests
+      name: Tests with Valgrind
+      environment:
+        ENABLE_VALGRIND: yes
   - run_regressions: &run_regressions
       name: Regression tests
       command: scripts/regressions.py -o test_results
@@ -282,7 +287,7 @@ jobs:
           name: Test buglist
           command: ./test/buglistTests.js
 
-  test_x86_linux:
+  test_x86_linux: &test_x86_linux
     docker:
       - image: buildpack-deps:bionic
     environment:
@@ -314,6 +319,11 @@ jobs:
           path: test_results/
           destination: test_results/
 
+  test_x86_linux_valgrind:
+    <<: *test_x86_linux
+    environment:
+      ENABLE_VALGRIND: yes
+
   test_x86_clang7_asan:
     docker:
       - image: buildpack-deps:cosmic
@@ -487,6 +497,10 @@ workflows:
           <<: *build_on_tags
           requires:
             - build_x86_linux
+      - test_x86_linux_valgrind:
+          <<: *build_on_tags
+          requires:
+            - build_x86_linux
       - test_x86_clang7_asan:
           <<: *build_on_tags
           requires: